diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-09-04 13:34:51 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-09-04 21:32:06 +0000 |
| commit | 0a42047aaa817abfa2a0a8de2d59c0f07c51b4d1 (patch) | |
| tree | 621b2d8b9fd90e1e2c926cf10778d0b04bd3bf91 | |
| parent | 024fc5df0079343e1a609009f3f62bd5b96324ff (diff) | |
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
6 files changed, 5 insertions, 30 deletions
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" diff --git a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc deleted file mode 100644 index 5f410f0ff..000000000 --- a/templates/machine/h3ulcb-nogfx/50_bblayers.conf.inc +++ /dev/null @@ -1,4 +0,0 @@ -BBLAYERS =+ "\ - ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \ - ${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \ - " diff --git a/templates/machine/h3ulcb-nogfx/50_local.conf.inc b/templates/machine/h3ulcb-nogfx/50_local.conf.inc deleted file mode 100644 index 4403e6ea9..000000000 --- a/templates/machine/h3ulcb-nogfx/50_local.conf.inc +++ /dev/null @@ -1,7 +0,0 @@ -MACHINE = "h3ulcb" -#see meta-agl/meta-agl-bsp/conf/include/agl_h3ulcb-nogfx.inc -require conf/include/agl_h3ulcb-nogfx.inc - -# custom inclusion of cogent layer -#see meta-agl/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc -require conf/include/rcar-gen3-adas.inc diff --git a/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md b/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md deleted file mode 100644 index da5d9b73e..000000000 --- a/templates/machine/h3ulcb-nogfx/README_machine_h3ulcb-nogfx.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine h3ulcb-nogfx -authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Yannick Gicquel <yannick.gicquel@iot.bzh> ---- - -### Machine h3ulcb-nogfx - -*Description is missing - please complete file meta-agl/templates/machine/m3ulcb-nogfx/README_machine_h3ulcb-nogfx.md* - |