libgles-omap3: merge in changes from overo repo

diff --git a/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr b/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
index 69c9f81..1b3c274 100755 (executable)
--- a/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
+++ b/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+CPUTYPE="$(cputype)"
+
 if [ "$1" = "" ]; then
        echo PVR-INIT: Please use start, stop, or restart.
        exit 1
@@ -16,39 +18,41 @@ if [ "$1" = "stop" ]; then
        exit 0
 fi
 
-echo Starting PVR
-insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
-#modprobe bc_example
-modprobe omaplfb
-
-pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
-
-if [ -e /dev/pvrsrvkm ] ; then 
-       rm -f /dev/pvrsrvkm
-fi
+if [ $CPUTYPE = "OMAP3530" ]; then
+       echo Starting PVR
+       insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
+       #modprobe bc_example
+       modprobe omaplfb
 
-mknod /dev/pvrsrvkm c $pvr_maj 0 
-chmod 666 /dev/pvrsrvkm
+       pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
 
-touch /etc/powervr-esrev
-
-SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
-ES_REVISION="$(cat /proc/cpuinfo | grep "CPU revision" | awk -F: '{print $2}')"
+       if [ -e /dev/pvrsrvkm ] ; then 
+               rm -f /dev/pvrsrvkm
+       fi
 
-if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
-       echo -n "Starting SGX fixup for"
-       if [ "${ES_REVISION}" = " 3" ] ; then
-       echo " ES3.x"
-       cp -a /usr/lib/ES3.0/* /usr/lib
-       cp -a /usr/bin/ES3.0/* /usr/bin 
-       else
-       echo "ES 2.x"
-       cp -a /usr/lib/ES2.0/* /usr/lib
-       cp -a /usr/bin/ES2.0/* /usr/bin 
+       mknod /dev/pvrsrvkm c $pvr_maj 0 
+       chmod 666 /dev/pvrsrvkm
+
+       touch /etc/powervr-esrev
+
+       SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
+       ES_REVISION="$(cat /proc/cpuinfo | grep "CPU revision" | awk -F: '{print $2}')"
+
+       if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
+               echo -n "Starting SGX fixup for"
+               if [ "${ES_REVISION}" = " 3" ] ; then
+                       echo " ES3.x"
+                       cp -a /usr/lib/ES3.0/* /usr/lib
+                       cp -a /usr/bin/ES3.0/* /usr/bin 
+               else
+                       echo "ES 2.x"
+                       cp -a /usr/lib/ES2.0/* /usr/lib
+                       cp -a /usr/bin/ES2.0/* /usr/bin 
+               fi
+               echo "${ES_REVISION}" > /etc/powervr-esrev
        fi
-       
-       echo "${ES_REVISION}" > /etc/powervr-esrev
+       /usr/bin/pvrsrvinit
+else
+       echo No SGX hardware, not starting PVR
 fi
 
-/usr/bin/pvrsrvinit
-

diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
index 25a2514..3a90c4e 100644 (file)
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
+++ b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
@@ -1,6 +1,8 @@
 require libgles-omap3.inc
 
 DEFAULT_PREFERENCE = "1"
+# download required binary distribution from:
+# http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_00_00_09.bin
 
 PR = "r1"