From ace6e82d2827c616ed033e84b1877b9b262ac4ed Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Mon, 7 Aug 2017 15:45:53 +0700 Subject: 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 Signed-off-by: Takamitsu Honda --- .../conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf | 12 ++-- .../sample/conf/m3ulcb/linaro-gcc/bsp/local.conf | 11 ++- .../m3ulcb/linaro-gcc/gfx-only/local-wayland.conf | 15 ++-- .../conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf | 83 ++++++++++++---------- 4 files changed, 63 insertions(+), 58 deletions(-) (limited to 'meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc') diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf index 8fcdf6f..c7c46f2 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/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/m3ulcb/linaro-gcc/bsp/local.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf index 74ca621..1816a3e 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/bsp/local.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/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" diff --git a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf index 89d741a..76559cd 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/gfx-only/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" @@ -255,6 +254,7 @@ MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" # for Wayland/Weston +DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" @@ -267,15 +267,12 @@ BBMASK .= "|mesa-gl" # Mask MMP recipes BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" -# Mask the gstreamer recipe for MMP -BBMASK .= "|meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer" - # Add for gstreamer plugins ugly LICENSE_FLAGS_WHITELIST = "commercial" # Fix the Warning of gstreamer plugins RDEPENDS_gstreamer1.0-plugins-bad = "libwayland-egl" -# 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/m3ulcb/linaro-gcc/mmp/local-wayland.conf b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf index 04ef841..57da5a5 100644 --- a/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/local-wayland.conf +++ b/meta-rcar-gen3/docs/sample/conf/m3ulcb/linaro-gcc/mmp/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" @@ -255,6 +254,7 @@ MACHINE_FEATURES_append = " gsx" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" # for Wayland/Weston +DISTRO_FEATURES_NATIVESDK_append = " wayland" DISTRO_FEATURES_append = " pam" PREFERRED_PROVIDER_virtual/libgles1 = "" PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" @@ -276,94 +276,103 @@ DISTRO_FEATURES_append = " mm-test" # for weston v4l2 renderer #DISTRO_FEATURES_append = " v4l2-renderer" -# OMX H263 decoder library for Linux (RTM0AC0000XV263D30SL40C) +# OMX H263 decoder library for Linux (RTM0AC0000XV263D30SL41C) #DISTRO_FEATURES_append = " h263dec_lib" -# OMX H264 decoder library for Linux (RTM0AC0000XV264D30SL40C) +# OMX H264 decoder library for Linux (RTM0AC0000XV264D30SL41C) DISTRO_FEATURES_append = " h264dec_lib" -# OMX H264 encoder library for Linux (RTM0AC0000XV264E30SL40C) +# OMX H264 encoder library for Linux (RTM0AC0000XV264E30SL41C) #DISTRO_FEATURES_append = " h264enc_lib" -# OMX H265 decoder library for Linux (RTM0AC0000XV265D30SL40C) +# OMX H265 decoder library for Linux (RTM0AC0000XV265D30SL41C) #DISTRO_FEATURES_append = " h265dec_lib" -# OMX MPEG2 decoder library for Linux (RTM0AC0000XVM2VD30SL40C) +# OMX MPEG2 decoder library for Linux (RTM0AC0000XVM2VD30SL41C) #DISTRO_FEATURES_append = " mpeg2dec_lib" -# OMX Media Component MPEG4 Decoder Library for Linux (RTM0AC0000XVM4VD30SL40C) +# OMX Media Component MPEG4 Decoder Library for Linux (RTM0AC0000XVM4VD30SL41C) #DISTRO_FEATURES_append = " mpeg4dec_lib" -# OMX Media Component VC-1 Decoder Library for Linux (RTM0AC0000XVVC1D30SL40C) +# OMX Media Component VC-1 Decoder Library for Linux (RTM0AC0000XVVC1D30SL41C) #DISTRO_FEATURES_append = " vc1dec_lib" -# OMX Media Component DivXD Decoder Library for Linux (RTM0AC0000XVDVXD30SL40C) +# OMX Media Component DivXD Decoder Library for Linux (RTM0AC0000XVDVXD30SL41C) #DISTRO_FEATURES_append = " divxdec_lib" -# OMX Media Component RealVideo Decoder Library for Linux (RTM0AC0000XVRLVD30SL40C) +# OMX Media Component RealVideo Decoder Library for Linux (RTM0AC0000XVRLVD30SL41C) #DISTRO_FEATURES_append = " rvdec_lib" -# OMX Media Component ALAC Decoder Library for Linux (RTM0AC0000XAALAD30SL40C) +# OMX Media Component ALAC Decoder Library for Linux (RTM0AC0000XAALAD30SL41C) #DISTRO_FEATURES_append = " alacdec_lib" -# OMX Media Component FLAC Decoder Library for Linux (RTM0AC0000XAFLAD30SL40C) +# OMX Media Component FLAC Decoder Library for Linux (RTM0AC0000XAFLAD30SL41C) #DISTRO_FEATURES_append = " flacdec_lib" -# OMX AAC-LC decoder library for Linux (RTM0AC0000XAAACD30SL40C), -# AAC-LC 2ch decoder middleware library for Linux (RTM0AC0000ADAACMZ1SL40C) +# OMX AAC-LC decoder library for Linux (RTM0AC0000XAAACD30SL41C), +# AAC-LC 2ch decoder middleware library for Linux (RTM0AC0000ADAACMZ1SL41C) DISTRO_FEATURES_append = " aaclcdec_lib" DISTRO_FEATURES_append = " aaclcdec_mdw" -# OMX aacPlus V2 decoder library for Linux (RTM0AC0000XAAAPD30SL40C), -# aacPlus V2 decoder middleware library for Linux (RTM0AC0000ADAAPMZ1SL40C) +# OMX aacPlus V2 decoder library for Linux (RTM0AC0000XAAAPD30SL41C), +# aacPlus V2 decoder middleware library for Linux (RTM0AC0000ADAAPMZ1SL41C) #DISTRO_FEATURES_append = " aacpv2dec_lib" #DISTRO_FEATURES_append = " aacpv2dec_mdw" -# OMX MP3 decoder library for Linux (RTM0AC0000XAMP3D30SL40C), -# MP3 decoder middleware library for Linux (RTM0AC0000ADMP3MZ1SL40C) +# OMX MP3 decoder library for Linux (RTM0AC0000XAMP3D30SL41C), +# MP3 decoder middleware library for Linux (RTM0AC0000ADMP3MZ1SL41C) #DISTRO_FEATURES_append = " mp3dec_lib" #DISTRO_FEATURES_append = " mp3dec_mdw" -# OMX WMA decoder library for Linux (RTM0AC0000XAWMAD30SL40C), -# WMA decoder middleware library for Linux (RTM0AC0000ADWMAMZ1SL40C) +# OMX WMA decoder library for Linux (RTM0AC0000XAWMAD30SL41C), +# WMA decoder middleware library for Linux (RTM0AC0000ADWMAMZ1SL41C) #DISTRO_FEATURES_append = " wmadec_lib" #DISTRO_FEATURES_append = " wmadec_mdw" -# OMX AAC-LC encoder library for Linux (RTM0AC0000XAAACE30SL40C) -# AAC-LC encoder middleware library for Linux (RTM0AC0000AEAACMZ1SL40C) +# OMX AAC-LC encoder library for Linux (RTM0AC0000XAAACE30SL41C) +# AAC-LC encoder middleware library for Linux (RTM0AC0000AEAACMZ1SL41C) #DISTRO_FEATURES_append = " aaclcenc_lib" #DISTRO_FEATURES_append = " aaclcenc_mdw" -# OMX Dolby(R) Digital decoder library for Linux (RTM0AC0000XADD5D30SL40C), -# Dolby(R) Digital decoder middleware library for Linux (RTM0AC0000ADDD5MZ1SL40C) +# OMX Dolby(R) Digital decoder library for Linux (RTM0AC0000XADD5D30SL41C), +# Dolby(R) Digital decoder middleware library for Linux (RTM0AC0000ADDD5MZ1SL41C) #DISTRO_FEATURES_append = " dddec_lib" #DISTRO_FEATURES_append = " dddec_mdw" -# CMS Basic Color Management Middleware for Linux (RTM0AC0000JRCMBCV0SL40C) +# OMX Media Component VP8 Decoder Library for Linux (RTM0AC0000XVVP8D30SL41C) +#DISTRO_FEATURES_append = " vp8dec_lib" + +# OMX Media Component VP8 Encoder Library for Linux (RTM0AC0000XVVP8E30SL41C) +#DISTRO_FEATURES_append = " vp8enc_lib" + +# OMX Media Component VP9 Decoder Library for Linux (RTM0AC0000XVVP9D30SL41C) +#DISTRO_FEATURES_append = " vp9dec_lib" + +# CMS Basic Color Management Middleware for Linux (RTM0AC0000JRCMBCV0SL41C) #DISTRO_FEATURES_append = " cmsbcm" -# CMS CMM3 Backlight Control Middleware for Linux (RTM0AC0000JRCMBLC0SL40C) +# CMS CMM3 Backlight Control Middleware for Linux (RTM0AC0000JRCMBLC0SL41C) #DISTRO_FEATURES_append = " cmsblc" -# CMS VSP2 Dynamic Gamma Correction Middleware for Linux (RTM0AC0000JRCMDGV0SL40C) +# CMS VSP2 Dynamic Gamma Correction Middleware for Linux (RTM0AC0000JRCMDGV0SL41C) #DISTRO_FEATURES_append = " cmsdgc" -# ISDB-T DTV Software Package for Linux (RTM0RC0000TE020000SL40C) +# ISDB-T DTV Software Package for Linux (RTM0RC0000TE020000SL41C) #DISTRO_FEATURES_append = " dtv" -# DVD Core-Middleware for Linux (RTM0RC0000XDVDC301SL40C) +# DVD Core-Middleware for Linux (RTM0RC0000XDVDC301SL41C) #DISTRO_FEATURES_append = " dvd" -# ADSP Driver for Linux (RCG3AHPDL4001ZDO) -# ADSP Interface for Linux (RCG3AHIFL4001ZDP) -# ADSP Framework (RCG3AHFWN0101ZDP) +# ADSP Driver for Linux (RCG3AHPDL4101ZDO) +# ADSP Interface for Linux (RCG3AHIFL4101ZDP) +# ADSP Framework (RCG3AHFWN0201ZDP) #DISTRO_FEATURES_append = " adsp" # AVB Software Package for Linux #DISTRO_FEATURES_append = " avb" -# Linux ICCOM driver (RCG3ZLIDL4001ZNO) -# Linux ICCOM library (RCG3ZLILL4001ZNO) +# Linux ICCOM driver (RCG3ZLIDL4101ZNO) +# Linux ICCOM library (RCG3ZLILL4101ZNO) #DISTRO_FEATURES_append = " iccom" # Evaluation packages -- cgit 1.2.3-korg