From b42c0c82d628cc3e7af728df668cf4459a50621f Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 27 Jul 2015 18:47:18 +0100 Subject: porter, silk: Add copy scripts for gfx and multimedia acceleration Add the copy scripts that locate the graphics and multimedia acceleration files in the "click through" license downloads and copies them into the correct location in the R-Car Yocto BSP layers --- meta-rcar-gen2/copy_gfx_software_porter.sh | 22 +++++ meta-rcar-gen2/copy_gfx_software_silk.sh | 22 +++++ meta-rcar-gen2/copy_mm_software_lcb.sh | 148 +++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100755 meta-rcar-gen2/copy_gfx_software_porter.sh create mode 100755 meta-rcar-gen2/copy_gfx_software_silk.sh create mode 100755 meta-rcar-gen2/copy_mm_software_lcb.sh diff --git a/meta-rcar-gen2/copy_gfx_software_porter.sh b/meta-rcar-gen2/copy_gfx_software_porter.sh new file mode 100755 index 0000000..7fbb4a0 --- /dev/null +++ b/meta-rcar-gen2/copy_gfx_software_porter.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +### Note: To run this script, please stand on meta-rcar-gen2 to run. + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_for_Linux ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_for_Linux-*.tar.gz +fi + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers-*.tar.gz +fi + +#cp $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers/sgx_gles2_m2_v115_eva/EVARTM0RC7791GLDE0001SL34C/EVA_SGX_KM_M2.tar.bz2 recipes-kernel/gles-module/gles-kernel-module/ +#cp $1/R-Car_Series_Evaluation_Software_Package_for_Linux/sgx_gles2_m2_v115_eva/EVARTM0RC7791GLRE0001SL34C/release/EVA_r8a7791_linux_sgx_binaries_gles2.tar.bz2 recipes-graphics/gles-module/gles-user-module/ + +SGX_KM=`find $1 -name *SGX_KM_M2.tar.bz2 | tail -1` +cp -r $SGX_KM recipes-kernel/gles-module/gles-kernel-module/SGX_KM_M2.tar.bz2 + +SGX_LIB=`find $1 -name *r8a7791_linux_sgx_binaries_gles2.tar.bz2 | tail -1` +cp -r $SGX_LIB recipes-graphics/gles-module/gles-user-module/r8a7791_linux_sgx_binaries_gles2.tar.bz2 diff --git a/meta-rcar-gen2/copy_gfx_software_silk.sh b/meta-rcar-gen2/copy_gfx_software_silk.sh new file mode 100755 index 0000000..90e71b9 --- /dev/null +++ b/meta-rcar-gen2/copy_gfx_software_silk.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +### Note: To run this script, please stand on meta-rcar-gen2 to run. + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_for_Linux ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_for_Linux-*.tar.gz +fi + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers-*.tar.gz +fi + +#cp $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers/sgx_gles2_e2_v115_eva/EVARTM0RC7794GLDE0001SL33C/EVA_SGX_KM_E2.tar.bz2 recipes-kernel/gles-module/gles-kernel-module/ +#cp $1/R-Car_Series_Evaluation_Software_Package_for_Linux/sgx_gles2_e2_v115_eva/EVARTM0RC7794GLRE0001SL33C/release/EVA_r8a7794_linux_sgx_binaries_gles2.tar.bz2 recipes-graphics/gles-module/gles-user-module/ + +SGX_KM=`find $1 -name *SGX_KM_E2.tar.bz2 | tail -1` +cp -r $SGX_KM recipes-kernel/gles-module/gles-kernel-module/SGX_KM_E2.tar.bz2 + +SGX_LIB=`find $1 -name *r8a7794_linux_sgx_binaries_gles2.tar.bz2 | tail -1` +cp -r $SGX_LIB recipes-graphics/gles-module/gles-user-module/r8a7794_linux_sgx_binaries_gles2.tar.bz2 diff --git a/meta-rcar-gen2/copy_mm_software_lcb.sh b/meta-rcar-gen2/copy_mm_software_lcb.sh new file mode 100755 index 0000000..e8e8b82 --- /dev/null +++ b/meta-rcar-gen2/copy_mm_software_lcb.sh @@ -0,0 +1,148 @@ +#!/bin/sh + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_for_Linux ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_for_Linux-*.tar.gz +fi + +if [ ! -d $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers ] +then + tar -C $1 -zxf $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers-*.tar.gz +fi + +find_change_name(){ + cur_path=`pwd` + fileP=`find . -name $1 | tail -1` + if [ "X${fileP}" != "X" ]; then + tmp_path=`dirname $fileP | tail -1` + cd $tmp_path + mv -f $1 $2 + fi + cd $cur_path +} +change_names() { + if [ ! -e $1 ]; then + echo "Directory $1 not existed. Exit !" + exit + fi + current_path=`pwd` + cd $1 + + find_change_name libomxr_core.so.0.0.0 libomxr_core.so.2.0.0 + find_change_name libomxr_mc_cmn.so.0.0.0 libomxr_mc_cmn.so.2.0.0 + find_change_name libomxr_mc_h264d.so.0.0.0 libomxr_mc_h264d.so.2.0.0 + find_change_name libomxr_mc_h264e.so.0.0.0 libomxr_mc_h264e.so.2.0.0 + find_change_name libomxr_mc_vecmn.so.0.0.0 libomxr_mc_vecmn.so.2.0.0 + find_change_name libomxr_mc_vcmn.so.0.0.0 libomxr_mc_vcmn.so.2.0.0 + find_change_name libomxr_mc_vdcmn.so.0.0.0 libomxr_mc_vdcmn.so.2.0.0 + find_change_name libuvcs_dec.so.0.0.0 libuvcs_dec.so.1.0.0 + find_change_name libuvcs_enc.so.0.0.0 libuvcs_enc.so.1.0.0 + find_change_name libvcp3_avcd.so.0.0.0 libvcp3_avcd.so.1.0.0 + find_change_name libvcp3_avce.so.0.0.0 libvcp3_avce.so.1.0.0 + find_change_name libvcp3_mcvd.so.0.0.0 libvcp3_mcvd.so.1.0.0 + find_change_name libvcp3_mcve.so.0.0.0 libvcp3_mcve.so.1.0.0 + + cd $current_path +} + + +TMP=`mktemp -d` + +#cp -rf $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers/mmp_reference_lib_v160_eva/EVARCH2M2MMPRDL001_1_6_0/RCH2M2MMPRDL001 $TMP +#cp -rf $1/R-Car_Series_Evaluation_Software_Package_for_Linux/mmp_reference_lib_m2e2_v160_eva/EVARCH2M2MMPRLL001_1_6_0/RCH2M2MMPRLL001 $TMP + +MM_DRVs=`find $1 -name RCH2M2MMPRDL001 | tail -1` +cp -rf $MM_DRVs $TMP + +MM_LIBs=`find $1 -name RCH2M2MMPRLL001 | tail -1` +cp -rf $MM_LIBs $TMP + +KERNEL_MODULES="$TMP/RCH2M2MMPRDL001" +tar -C $KERNEL_MODULES/fdpm/fdpm-module/files/ -jcf fdpm-kernel.tar.bz2 . +tar -C $KERNEL_MODULES/mmngr/mmngr-module/files/ -jcf mmngr-kernel.tar.bz2 . +tar -C $KERNEL_MODULES/mmngrbuf/mmngrbuf-module/files/ -jcf mmngrbuf-kernel.tar.bz2 . +tar -C $KERNEL_MODULES/s3ctl/s3ctl-module/files/ -jcf s3ctl-kernel.tar.bz2 . +tar -C $KERNEL_MODULES/vspm/vspm-module/files/ -jcf vspm-kernel.tar.bz2 . + +USER_MODULES="$TMP/RCH2M2MMPRLL001" +tar -C $USER_MODULES/fdpm/fdpm-module/files/ -jcf fdpm.tar.bz2 . +tar -C $USER_MODULES/mmngr/mmngr-module/files/ -jcf mmngr.tar.bz2 . +tar -C $USER_MODULES/mmngrbuf/mmngrbuf-module/files/ -jcf mmngrbuf.tar.bz2 . +tar -C $USER_MODULES/s3ctl/s3ctl-module/files/ -jcf s3ctl.tar.bz2 . +tar -C $USER_MODULES/vspm/vspm-module/files/ -jcf vspm.tar.bz2 . + +rm -rf $TMP/* + +mv fdpm-kernel.tar.bz2 recipes-kernel/fdpm-module/files +mv mmngr-kernel.tar.bz2 recipes-kernel/mmngr-module/files/mmngr.tar.bz2 +mv mmngrbuf-kernel.tar.bz2 recipes-kernel/mmngr-module/files/mmngrbuf.tar.bz2 +mv s3ctl-kernel.tar.bz2 recipes-kernel/s3ctl-module/files +mv vspm-kernel.tar.bz2 recipes-kernel/vspm-module/files + +mv fdpm.tar.bz2 recipes-multimedia/fdpm-module/files +mv mmngr.tar.bz2 recipes-multimedia/mmngr-module/files +mv mmngrbuf.tar.bz2 recipes-multimedia/mmngr-module/files +mv s3ctl.tar.bz2 recipes-multimedia/s3ctl-module/files +mv vspm.tar.bz2 recipes-multimedia/vspm-module/files/vspm-user.tar.bz2 + +### +OMXTMP=`mktemp -d` +#cp -a $1/R-Car_Series_Evaluation_Software_Package_for_Linux/omx_video_m2e2_v160_eva/* $OMXTMP +#cp -a $1/R-Car_Series_Evaluation_Software_Package_of_Linux_Drivers/omx_video_v160_eva/* $OMXTMP +OMX_LIBs=`find $1 -name omx_video_m2e2_v* | tail -1` +OMX_DRVs=`find $1 -name omx_video_v* | tail -1` +cp -rf $OMX_LIBs/* $OMXTMP +cp -rf $OMX_DRVs/* $OMXTMP + +unzip -q -d $TMP $OMXTMP/EVARTM0AC0000XCMCTL20SL32C.zip +mv $TMP/EVARTM0AC0000XCMCTL20SL32C $TMP/RTM0AC0000XCMCTL20SL32C +tar zxf $TMP/RTM0AC0000XCMCTL20SL32C/Software.tar.gz -C $TMP/RTM0AC0000XCMCTL20SL32C/ +rm $TMP/RTM0AC0000XCMCTL20SL32C/Software.tar.gz +change_names "$TMP/RTM0AC0000XCMCTL20SL32C" +tar -C $TMP/ -jcf RTM0AC0000XCMCTL20SL32C.tar.bz2 . +rm -rf $TMP/* +mv RTM0AC0000XCMCTL20SL32C.tar.bz2 recipes-multimedia/omx-module/files/ + +unzip -q -d $TMP $OMXTMP/EVARTM0AC0000XV264D20SL32C.zip +mv $TMP/EVARTM0AC0000XV264D20SL32C $TMP/RTM0AC0000XV264D20SL32C +tar zxf $TMP/RTM0AC0000XV264D20SL32C/Software.tar.gz -C $TMP/RTM0AC0000XV264D20SL32C +rm $TMP/RTM0AC0000XV264D20SL32C/Software.tar.gz +change_names "$TMP/RTM0AC0000XV264D20SL32C" +tar -C $TMP/ -jcf RTM0AC0000XV264D20SL32C.tar.bz2 . +rm -rf $TMP/* +mv RTM0AC0000XV264D20SL32C.tar.bz2 recipes-multimedia/omx-module/files/ + +unzip -q -d $TMP $OMXTMP/EVARTM0AC0000XV264E20SL32C.zip +mv $TMP/EVARTM0AC0000XV264E20SL32C $TMP/RTM0AC0000XV264E20SL32C +tar zxf $TMP/RTM0AC0000XV264E20SL32C/Software.tar.gz -C $TMP/RTM0AC0000XV264E20SL32C +rm $TMP/RTM0AC0000XV264E20SL32C/Software.tar.gz +change_names "$TMP/RTM0AC0000XV264E20SL32C" +tar -C $TMP/ -jcf RTM0AC0000XV264E20SL32C.tar.bz2 . +rm -rf $TMP/* +mv RTM0AC0000XV264E20SL32C.tar.bz2 recipes-multimedia/omx-module/files/ + +unzip -q -d $TMP $OMXTMP/EVARTM0AC0000XVCMND20SL32C.zip +mv $TMP/EVARTM0AC0000XVCMND20SL32C $TMP/RTM0AC0000XVCMND20SL32C +tar zxf $TMP/RTM0AC0000XVCMND20SL32C/Software.tar.gz -C $TMP/RTM0AC0000XVCMND20SL32C +rm $TMP/RTM0AC0000XVCMND20SL32C/Software.tar.gz +change_names "$TMP/RTM0AC0000XVCMND20SL32C" +tar -C $TMP/ -jcf RTM0AC0000XVCMND20SL32C.tar.bz2 . +rm -rf $TMP/* +mv RTM0AC0000XVCMND20SL32C.tar.bz2 recipes-multimedia/omx-module/files/ + +unzip -q -d $TMP $OMXTMP/EVARTM0AC0000XVCMNE20SL32C.zip +mv $TMP/EVARTM0AC0000XVCMNE20SL32C $TMP/RTM0AC0000XVCMNE20SL32C +tar zxf $TMP/RTM0AC0000XVCMNE20SL32C/Software.tar.gz -C $TMP/RTM0AC0000XVCMNE20SL32C +rm $TMP/RTM0AC0000XVCMNE20SL32C/Software.tar.gz +change_names "$TMP/RTM0AC0000XVCMNE20SL32C" +tar -C $TMP/ -jcf RTM0AC0000XVCMNE20SL32C.tar.bz2 . +rm -rf $TMP/* +mv RTM0AC0000XVCMNE20SL32C.tar.bz2 recipes-multimedia/omx-module/files/ + +unzip -q -d $TMP $OMXTMP/RTM0AC0000UVCSCMN1SL32C.zip +mv $TMP/RTM0AC0000UVCSCMN1SL32C $TMP/uvcs +tar -C $TMP/ -jcf uvcs-kernel.tar.bz2 . +rm -rf $TMP +mv uvcs-kernel.tar.bz2 recipes-kernel/uvcs-module/files + +rm -rf $OMXTMP -- cgit 1.2.3-korg From c485c9318822db060df2d3f793aec55dc8e2a2b7 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Thu, 20 Aug 2015 15:47:05 +0100 Subject: readme/maintainers: Change maintainer of non-Genivi layers Takeshi Saito is now the maintainer of the non-Genivi layers --- MAINTAINERS | 6 +++--- README | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index bd633ec..7512138 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20,13 +20,13 @@ M: Stephen Lawrence F: / Renesas ARM SoCs R-Car Generation 2 -M: Nobuhiro Iwamatsu +M: Takeshi Saito F: meta-rcar-gen2 Renesas ARM SoCs rmobile -M: Nobuhiro Iwamatsu +M: Takeshi Saito F: meta-rmobile COMMON -M: Nobuhiro Iwamatsu +M: Takeshi Saito F: common/ diff --git a/README b/README index cc5cf2b..a7079d2 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ OpenEmbedded/Yocto BSP layer for Renesas Electronics's SoCs This layer provides support for Renesas Electronics's platforms for use with OpenEmbedded and/or Yocto. -Layer maintainers: Nobuhiro Iwamatsu +Layer maintainers: Takeshi Saito Stephen Lawrence (Genivi branches) Supported Boards/Machines -- cgit 1.2.3-korg From e3b0f456ba8176253cf0d289a14bf26b1ea2134a Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Thu, 20 Aug 2015 15:58:45 +0100 Subject: alt: mesa: Temporary workaround to upstream Mesa build issue Temporarily disable Cortex A7 optimisation to avoid upstream build issue between YP 1.7 gcc toolchain and Mesa 10.1,x releases. The build goes away and never returns. Graphics acceleration makes no use of Mesa so there should be no performance impact. This should be removed once upstream is fixed. --- meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend index c7f7f28..c5b6a2d 100644 --- a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend +++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend @@ -11,3 +11,7 @@ def map_libs(d): MESATARGET := "${@map_libs(d)}" include mesa-${MESATARGET}.inc + +# Temporarily disable Cortex A7 optimisation to avoid upstream build issue +# between YP 1.7 gcc toolchain and Mesa 10.1,x releases. +TARGET_CC_ARCH_remove_alt = "-mtune=cortex-a7" -- cgit 1.2.3-korg