From 0a42047aaa817abfa2a0a8de2d59c0f07c51b4d1 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Wed, 4 Sep 2019 13:34:51 +0000 Subject: Revert "Add nogfx build for h3ulcb" This seems to have broken master. Needs to be edited. Thus revert and resubmit. This reverts commit dd21b3a6e340006d2ef4036cabf33c9e9a66e9ac. Change-Id: I2423dacba83813cc6350096c89d80cf1d23e9568 --- meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc | 5 ----- meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 5 +++++ meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc deleted file mode 100644 index 946fdc81b..000000000 --- a/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc +++ /dev/null @@ -1,5 +0,0 @@ -require conf/include/agl_ulcb-nogfx.inc -SOC_FAMILY = "r8a7795" -BOARD_NAME = "h3ulcb" - -DTB_SUFFIX = "r8a7795-h3ulcb" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 6c84e72f3..a5789c324 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -3,3 +3,8 @@ SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" DTB_SUFFIX = "r8a7796-m3ulcb" + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" diff --git a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc index d8e506915..8d97996f9 100644 --- a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc @@ -8,8 +8,3 @@ WKS_FILE = "singlepart-noloader.wks" AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" RENESAS_DATADIR = "/usr" - -# Mask graphic Pkgs -BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" -# Mask MMP recipes -BBMASK += "kernel-module-uvcs-drv|omx-user-module" -- cgit 1.2.3-korg