From 78588a4a9eaa1b150bb84d793bc4f1bdfaba9fb0 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Sat, 22 Sep 2018 14:17:37 +0000 Subject: Mutualizes code for ulcb card family conf file Remove duplicate code between ulcb card configuration card. Since more an more ulcb card and extention, it becomes difficult to maintain the conf file of the ulcb family. Change-Id: Id5648f4e75c464875d3b175c769e1fdd7f4312f5 Signed-off-by: Ronan Le Martret --- meta-agl-bsp/conf/include/agl_h3ulcb.inc | 47 +---------------------- meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 10 +---- meta-agl-bsp/conf/include/agl_m3ulcb.inc | 52 +------------------------- meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc | 8 ++++ meta-agl-bsp/conf/include/agl_ulcb.inc | 41 ++++++++++++++++++++ 5 files changed, 52 insertions(+), 106 deletions(-) create mode 100644 meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc create mode 100644 meta-agl-bsp/conf/include/agl_ulcb.inc diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index cb4edb46d..60c266d10 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -1,47 +1,2 @@ +require conf/include/agl_ulcb.inc SOC_FAMILY = "r8a7795" - -# Enable AGL virtualization features -MACHINE_FEATURES_append = " agl-egvirt" - -# for Wayland/Weston weston-laucher -DISTRO_FEATURES_append = " pam" - -# Enable Gfx Pkgs -MACHINE_FEATURES_append = " gsx" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" - -# for Wayland/Weston -PREFERRED_PROVIDER_virtual/libgles1 = "" -PREFERRED_PROVIDER_virtual/libgles2 = "virtual-gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "virtual-gles-user-module" -PREFERRED_PROVIDER_virtual/libgl = "" -PREFERRED_PROVIDER_virtual/mesa = "mesa" -PREFERRED_PROVIDER_libgbm = "libgbm" -PREFERRED_RPROVIDER_libgbm-dev = "libgbm" - -PREFERRED_RPROVIDER_libomxil = "omx-user-module" - -# Add for gstreamer plugins ugly -LICENSE_FLAGS_WHITELIST = "commercial" - -MACHINE_FEATURES_append = " multimedia" - -DISTRO_FEATURES_append = " use_eva_pkg" - -#DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib" -DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" - -IMAGE_INSTALL_append_rcar-gen3 = " \ - kernel-devicetree \ - kernel-module-pvrsrvkm \ - kernel-module-vsp2 \ - kernel-module-vspm \ - kernel-module-vspm-if \ - omx-user-module \ -" - -OSTREE_BOOTLOADER ?= "u-boot" - -WKS_FILE = "singlepart-noloader.wks" - -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index e44f8c28d..0a7f9438a 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -1,15 +1,7 @@ +require conf/include/agl_ulcb-nogfx.inc SOC_FAMILY = "r8a7796" # Mask graphic Pkgs BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes BBMASK += "kernel-module-uvcs-drv|omx-user-module" - - -DISTRO_FEATURES_append = " sota" -OSTREE_KERNEL = "Image" -IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" -OSTREE_BOOTLOADER ?= "u-boot" - -WKS_FILE = "singlepart-noloader.wks" -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 46c6f1f28..d7dc444f9 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -1,52 +1,2 @@ +require conf/include/agl_ulcb.inc SOC_FAMILY = "r8a7796" - -# Enable AGL virtualization features -MACHINE_FEATURES_append = " agl-egvirt" - -# for Wayland/Weston weston-laucher -DISTRO_FEATURES_append = " pam" - -# Enable Gfx Pkgs -MACHINE_FEATURES_append = " gsx" -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" - -# for Wayland/Weston -PREFERRED_PROVIDER_virtual/libgles1 = "" -PREFERRED_PROVIDER_virtual/libgles2 = "virtual-gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "virtual-gles-user-module" -PREFERRED_PROVIDER_virtual/libgl = "" -PREFERRED_PROVIDER_virtual/mesa = "mesa" -PREFERRED_PROVIDER_libgbm = "libgbm" -PREFERRED_RPROVIDER_libgbm-dev = "libgbm" - -PREFERRED_RPROVIDER_libomxil = "omx-user-module" - - -# Add for gstreamer plugins ugly -LICENSE_FLAGS_WHITELIST = "commercial" - - -MACHINE_FEATURES_append = " multimedia" - -DISTRO_FEATURES_append = " use_eva_pkg" - -#DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib" -DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" - -IMAGE_INSTALL_append_rcar-gen3 = " \ - kernel-devicetree \ - kernel-module-pvrsrvkm \ - kernel-module-vsp2 \ - kernel-module-vspm \ - kernel-module-vspm-if \ - omx-user-module \ -" - -DISTRO_FEATURES_append = " sota" -OSTREE_KERNEL = "Image" -IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-r8a7796-m3ulcb.dtb" -OSTREE_BOOTLOADER ?= "u-boot" - -WKS_FILE = "singlepart-noloader.wks" - -AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc new file mode 100644 index 000000000..d8dc3b034 --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc @@ -0,0 +1,8 @@ +DISTRO_FEATURES_append = " sota" + +OSTREE_KERNEL = "Image" +IMAGE_BOOT_FILES_sota = "m3ulcb-ota-bootfiles/* Image-${SOC_FAMILY}-m3ulcb.dtb" +OSTREE_BOOTLOADER ?= "u-boot" + +WKS_FILE = "singlepart-noloader.wks" +AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum" diff --git a/meta-agl-bsp/conf/include/agl_ulcb.inc b/meta-agl-bsp/conf/include/agl_ulcb.inc new file mode 100644 index 000000000..d71a6941c --- /dev/null +++ b/meta-agl-bsp/conf/include/agl_ulcb.inc @@ -0,0 +1,41 @@ +require conf/include/agl_ulcb-nogfx.inc + +# Enable AGL virtualization features +MACHINE_FEATURES_append = " agl-egvirt" + +# for Wayland/Weston weston-laucher +DISTRO_FEATURES_append = " pam" + +# Enable Gfx Pkgs +MACHINE_FEATURES_append = " gsx" +MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" + +# for Wayland/Weston +PREFERRED_PROVIDER_virtual/libgles1 = "" +PREFERRED_PROVIDER_virtual/libgles2 = "virtual-gles-user-module" +PREFERRED_PROVIDER_virtual/egl = "virtual-gles-user-module" +PREFERRED_PROVIDER_virtual/libgl = "" +PREFERRED_PROVIDER_virtual/mesa = "mesa" +PREFERRED_PROVIDER_libgbm = "libgbm" +PREFERRED_RPROVIDER_libgbm-dev = "libgbm" + +PREFERRED_RPROVIDER_libomxil = "omx-user-module" + +# Add for gstreamer plugins ugly +LICENSE_FLAGS_WHITELIST = "commercial" + +MACHINE_FEATURES_append = " multimedia" + +DISTRO_FEATURES_append = " use_eva_pkg" + +#DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib" +DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw" + +IMAGE_INSTALL_append_rcar-gen3 = " \ + kernel-devicetree \ + kernel-module-pvrsrvkm \ + kernel-module-vsp2 \ + kernel-module-vspm \ + kernel-module-vspm-if \ + omx-user-module \ +" -- cgit 1.2.3-korg