From 14e6ace79ab1e9e379c9095869cd05aae8429e12 Mon Sep 17 00:00:00 2001 From: Hau Vo Date: Tue, 22 Aug 2023 12:10:17 +0900 Subject: Restructure Salvator-x .inc files This commit restructure the .inc files relate to H3/M3 Salvator-x boards. Bug-AGL: SPEC-4808 Signed-off-by: Hau Vo Change-Id: I9e01f61f75010c1cbf54feec30422855b43cf051 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29175 Reviewed-by: Harunobu Kurokawa Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account (cherry picked from commit 979598c6e9b855cec0ff56c95eae0d47e9c0e21a) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29201 --- meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc | 18 +----------------- meta-agl-bsp/conf/include/agl_h3-salvator-x.inc | 5 +---- meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc | 17 +---------------- meta-agl-bsp/conf/include/agl_m3-salvator-x.inc | 5 +---- meta-agl-bsp/conf/include/agl_salvator-nogfx.inc | 17 +++++++++++++++++ meta-agl-bsp/conf/include/agl_salvator.inc | 6 ++++++ 6 files changed, 27 insertions(+), 41 deletions(-) create mode 100644 meta-agl-bsp/conf/include/agl_salvator-nogfx.inc create mode 100644 meta-agl-bsp/conf/include/agl_salvator.inc (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc index 455a368e6..4ff103df8 100644 --- a/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x-nogfx.inc @@ -1,25 +1,9 @@ -require conf/include/agl_rcar-nogfx.inc +require conf/include/agl_salvator-nogfx.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3-salvator-x" DTB_SUFFIX = "r8a77951-salvator-xs" -# Mask graphic Pkgs -BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" -# Mask MMP recipes -BBMASK += "kernel-module-uvcs-drv|omx-user-module" - -# Work around use of obsolete Weston backend-fbdev in meta-rcar-gen3 -# when building without the proprietary driver stack. Masking out the -# weston_%.bbappend seems the simplest approach for now, as forcing -# USE_GLES = "1" to disable the adding of -Dbackend-default="fbdev" to -# EXTRA_OEMESON triggers adding "libgbm" to DEPENDS, which breaks due -# to that being a component specific to the proprietary stack we are -# explicitly disabling. If the "libgbm" usage in the bbappend was -# instead "virtual/libgbm" as is now used in poky, it might be possible -# to just tweak PREFERRED_PROVIDER_virtual/libgbm = "mesa". -BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend" - # do use software rendering to display the compositor # used for images w/o binary-only driver WESTON_USE_PIXMAN = "1" diff --git a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc index 46e10878b..134b1dd1f 100644 --- a/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc +++ b/meta-agl-bsp/conf/include/agl_h3-salvator-x.inc @@ -1,9 +1,6 @@ -require conf/include/agl_rcar.inc +require conf/include/agl_salvator.inc SOC_FAMILY = "r8a7795" BOARD_NAME = "h3-salvator-x" DTB_SUFFIX = "r8a77951-salvator-xs" -IMAGE_INSTALL:append:rcar-gen3 = " \ - kernel-module-vspm-if \ -" diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc index b50f36355..ebbb3006a 100644 --- a/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x-nogfx.inc @@ -1,21 +1,6 @@ -require conf/include/agl_rcar-nogfx.inc +require conf/include/agl_salvator-nogfx.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3-salvator-x" DTB_SUFFIX = "r8a7796-salvator-xs" -# Mask graphic Pkgs -BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" -# Mask MMP recipes -BBMASK += "kernel-module-uvcs-drv|omx-user-module" - -# Work around use of obsolete Weston backend-fbdev in meta-rcar-gen3 -# when building without the proprietary driver stack. Masking out the -# weston_%.bbappend seems the simplest approach for now, as forcing -# USE_GLES = "1" to disable the adding of -Dbackend-default="fbdev" to -# EXTRA_OEMESON triggers adding "libgbm" to DEPENDS, which breaks due -# to that being a component specific to the proprietary stack we are -# explicitly disabling. If the "libgbm" usage in the bbappend was -# instead "virtual/libgbm" as is now used in poky, it might be possible -# to just tweak PREFERRED_PROVIDER_virtual/libgbm = "mesa". -BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend" diff --git a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc index b40834b63..355040ba9 100644 --- a/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc +++ b/meta-agl-bsp/conf/include/agl_m3-salvator-x.inc @@ -1,9 +1,6 @@ -require conf/include/agl_rcar.inc +require conf/include/agl_salvator.inc SOC_FAMILY = "r8a7796" BOARD_NAME = "m3-salvator-x" DTB_SUFFIX = "r8a7796-salvator-xs" -IMAGE_INSTALL:append:rcar-gen3 = " \ - kernel-module-vspm-if \ -" diff --git a/meta-agl-bsp/conf/include/agl_salvator-nogfx.inc b/meta-agl-bsp/conf/include/agl_salvator-nogfx.inc new file mode 100644 index 000000000..06e635ca0 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_salvator-nogfx.inc @@ -0,0 +1,17 @@ +require conf/include/agl_rcar-nogfx.inc + +# Mask graphic Pkgs +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +# Mask MMP recipes +BBMASK += "kernel-module-uvcs-drv|omx-user-module" +# Work around use of obsolete Weston backend-fbdev in meta-rcar-gen3 +# when building without the proprietary driver stack. Masking out the +# weston_%.bbappend seems the simplest approach for now, as forcing +# USE_GLES = "1" to disable the adding of -Dbackend-default="fbdev" to +# EXTRA_OEMESON triggers adding "libgbm" to DEPENDS, which breaks due +# to that being a component specific to the proprietary stack we are +# explicitly disabling. If the "libgbm" usage in the bbappend was +# instead "virtual/libgbm" as is now used in poky, it might be possible +# to just tweak PREFERRED_PROVIDER_virtual/libgbm = "mesa". +BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend" + diff --git a/meta-agl-bsp/conf/include/agl_salvator.inc b/meta-agl-bsp/conf/include/agl_salvator.inc new file mode 100644 index 000000000..78457868a --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_salvator.inc @@ -0,0 +1,6 @@ +require conf/include/agl_rcar.inc + +IMAGE_INSTALL:append:rcar-gen3 = " \ + kernel-module-vspm-if \ +" + -- cgit 1.2.3-korg