summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen2
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2016-10-25 19:02:07 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-10-25 13:45:49 +0000
commit7504005d38ac076916a0616fe5d13f46c31a08f5 (patch)
tree73d2b7020cc6993d84849c01eff3d466c56fe85b /meta-rcar-gen2
parent82611ccadef36ab0b8a6fd6fb1cf055e115f1ef5 (diff)
Update R-Car series evaluation software package
Gfx drivers and multimedia packages provided by Renesas are updated. Also fix some messages when missing these packages. Change-Id: Ifa094c6f8f86a26f523bd8f4503ae22580998c29 Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> (cherry picked from commit f54635ba5cb8e905c12d0904cfa225ecf3d2beb4)
Diffstat (limited to 'meta-rcar-gen2')
-rw-r--r--meta-rcar-gen2/scripts/setup_mm_packages.sh31
1 files changed, 18 insertions, 13 deletions
diff --git a/meta-rcar-gen2/scripts/setup_mm_packages.sh b/meta-rcar-gen2/scripts/setup_mm_packages.sh
index f6b5bbb..a2a87da 100644
--- a/meta-rcar-gen2/scripts/setup_mm_packages.sh
+++ b/meta-rcar-gen2/scripts/setup_mm_packages.sh
@@ -1,13 +1,14 @@
#!/bin/bash
-MM_PKG_REVISION="20151228"
+MM_PKG_USERLAND_REV="20160920"
+MM_PKG_KERNEL_REV="20151228"
MM_PKG_NAME="R-Car_Series_Evaluation_Software_Package"
MM_PKG_USERLAND="for_Linux"
MM_PKG_KERNEL="of_Linux_Drivers"
-ZIP_1=${MM_PKG_NAME}_${MM_PKG_USERLAND}-${MM_PKG_REVISION}.zip
-ZIP_2=${MM_PKG_NAME}_${MM_PKG_KERNEL}-${MM_PKG_REVISION}.zip
+ZIP_1=${MM_PKG_NAME}_${MM_PKG_USERLAND}-${MM_PKG_USERLAND_REV}.zip
+ZIP_2=${MM_PKG_NAME}_${MM_PKG_KERNEL}-${MM_PKG_KERNEL_REV}.zip
COPY_GFX_SCRIPT=copy_gfx_software_$1.sh
COPY_MM_SCRIPT=copy_mm_software_lcb.sh
@@ -24,15 +25,19 @@ function copy_mm_packages() {
unzip -o $DOWNLOAD_DIR/$ZIP_2
cd ..
else
- echo -n "The graphics and multimedia acceleration packages for "
- echo -e "the R-Car M2 Porter board can be download from :"
- echo -e " <http://www.renesas.com/secret/r_car_download/rcar_demoboard.jsp>"
echo -e
- echo -n "These 2 files from there should be store in your"
- echo -e "'$DOWNLOAD_DIR' directory."
- echo -e " $ZIP_1"
- echo -e " $ZIP_2"
- return 1
+ echo -e "ERROR: Missing Renesas proprietary software packages for Porter board."
+ echo -e
+ echo -e " The graphics and multimedia acceleration packages for "
+ echo -e " the R-Car M2 Porter board can be download from :"
+ echo -e " <http://www.renesas.com/secret/r_car_download/rcar_demoboard.jsp>"
+ echo -e
+ echo -e " These 2 files from there should be store in"
+ echo -e " '$DOWNLOAD_DIR' directory."
+ echo -e " $ZIP_1"
+ echo -e " $ZIP_2"
+ echo -e
+ return 1 2>&- || exit 1
fi
fi
@@ -42,7 +47,7 @@ function copy_mm_packages() {
cd ../..
else
echo "scripts to copy GFX drivers for '$1' not found."
- return 1
+ return 1 2>&- || exit 1
fi
if [ -f meta-renesas/meta-rcar-gen2/$COPY_MM_SCRIPT ]; then
@@ -51,6 +56,6 @@ function copy_mm_packages() {
cd ../..
else
echo "scripts to copy MM software for '$1' not found."
- return 1
+ return 1 2>&- || exit 1
fi
}