summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp
diff options
context:
space:
mode:
authorThuy Tran <thuy.tran.xh@rvc.renesas.com>2017-08-07 15:45:53 +0700
committerThuy Tran <thuy.tran.xh@rvc.renesas.com>2018-01-30 10:07:59 +0700
commitace6e82d2827c616ed033e84b1877b9b262ac4ed (patch)
treeb3cb7f5bac5a62d08159d49ac9ee7102dcf019ee /meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp
parent81f919711c2cc1758cc1633c86d4eb8745ffe5df (diff)
rcar-gen3: conf: Modify sample configurations
This commit modifies sample configurations for Salvator-X and ULCB to build with YP2.4 rocko. Signed-off-by: Thuy Tran <thuy.tran.xh@rvc.renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp')
-rw-r--r--meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf12
-rw-r--r--meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf11
2 files changed, 11 insertions, 12 deletions
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
index 9f9655d..a02f5eb 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local-wayland.conf
@@ -105,7 +105,7 @@ DISTRO ?= "poky"
# - 'package_rpm' for rpm style packages
# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
# We default to rpm:
-PACKAGE_CLASSES ?= "package_ipk"
+PACKAGE_CLASSES ?= "package_rpm"
#
# SDK target architecture
@@ -152,8 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
# - 'image-swab' to perform host system intrusion detection
# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-# image-prelink disabled for now due to issues with IFUNC symbol relocation
-USER_CLASSES ?= "buildstats image-mklibs"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
#
# Runtime testing of images
@@ -242,7 +241,7 @@ DISTRO_FEATURES_append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
# Linaro GCC
-GCCVERSION = "linaro-5.2"
+GCCVERSION = "linaro-7.1"
# add the static lib to SDK toolchain
SDKIMAGE_FEATURES_append = " staticdev-pkgs"
@@ -251,6 +250,7 @@ SDKIMAGE_FEATURES_append = " staticdev-pkgs"
BBMASK = "meta-linaro/meta-optee/recipes-security/optee"
# for Wayland/Weston weston-laucher
+DISTRO_FEATURES_NATIVESDK_append = " wayland"
DISTRO_FEATURES_append = " pam"
# Mask the wayland related to GFX
@@ -264,6 +264,6 @@ BBMASK .= "|meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer"
# Add for gstreamer plugins ugly
LICENSE_FLAGS_WHITELIST = "commercial"
-# Linux ICCOM driver (RCG3ZLIDL4001ZNO)
-# Linux ICCOM library (RCG3ZLILL4001ZNO)
+# Linux ICCOM driver (RCG3ZLIDL4101ZNO)
+# Linux ICCOM library (RCG3ZLILL4101ZNO)
#DISTRO_FEATURES_append = " iccom"
diff --git a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
index f25fc56..ad2d207 100644
--- a/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
+++ b/meta-rcar-gen3/docs/sample/conf/h3ulcb/linaro-gcc/bsp/local.conf
@@ -105,7 +105,7 @@ DISTRO ?= "poky"
# - 'package_rpm' for rpm style packages
# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
# We default to rpm:
-PACKAGE_CLASSES ?= "package_ipk"
+PACKAGE_CLASSES ?= "package_rpm"
#
# SDK target architecture
@@ -152,8 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
# - 'image-swab' to perform host system intrusion detection
# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-# image-prelink disabled for now due to issues with IFUNC symbol relocation
-USER_CLASSES ?= "buildstats image-mklibs"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
#
# Runtime testing of images
@@ -242,7 +241,7 @@ DISTRO_FEATURES_append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
# Linaro GCC
-GCCVERSION = "linaro-5.2"
+GCCVERSION = "linaro-7.1"
# add the static lib to SDK toolchain
SDKIMAGE_FEATURES_append = " staticdev-pkgs"
@@ -255,6 +254,6 @@ BBMASK .= "|gles-user-module|kernel-module-gles|wayland-kms|libgbm"
# Mask MMP recipes
BBMASK .= "|kernel-module-uvcs-drv|omx-user-module"
-# Linux ICCOM driver (RCG3ZLIDL4001ZNO)
-# Linux ICCOM library (RCG3ZLILL4001ZNO)
+# Linux ICCOM driver (RCG3ZLIDL4101ZNO)
+# Linux ICCOM library (RCG3ZLILL4101ZNO)
#DISTRO_FEATURES_append = " iccom"