libgles-omap3: merge in updates from arago

* ES3.x do_install fix
* AM335x support

And one non-arago fix: break dependency on 'initscripts' package

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

1 files changed, 23 insertions, 6 deletions

diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr b/recipes-graphics/libgles/libgles-omap3/rc.pvr
index d32f9e4c..07efa663 100755
--- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
+++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
@@ -1,6 +1,15 @@
 #!/bin/sh
 PATH=$PATH:/usr/sbin
 
+# Check if an fb device is available.  If not then just go ahead and
+# exit because we have no display.
+fbset > /dev/null 2>&1
+if [ "$?" == "1" ]
+then
+    # looks like there is no display, so let's exit
+    exit 0
+fi
+
 BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
 YRES="$(fbset | grep geom | awk '{print $3}')"
 
@@ -28,7 +37,7 @@ if [ "$BITSPERPIXEL" = "32" ] ; then
 fi
 
 # Try to enable triple buffering when there's enough VRAM
-fbset -vyres $(expr $YRES \* 3) 
+fbset -vyres $(expr $YRES \* 3)
 
 sgxprepare () {
         echo Starting PVR
@@ -39,11 +48,11 @@ sgxprepare () {
         pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
         bc_maj=`grep "bc" /proc/devices | cut -b1,2,3`
 
-        if [ -e /dev/pvrsrvkm ] ; then 
+        if [ -e /dev/pvrsrvkm ] ; then
                 rm -f /dev/pvrsrvkm
         fi
 
-        mknod /dev/pvrsrvkm c $pvr_maj 0 
+        mknod /dev/pvrsrvkm c $pvr_maj 0
         chmod 666 /dev/pvrsrvkm
 
         touch /etc/powervr-esrev
@@ -56,7 +65,7 @@ sgxfinish () {
                 echo -n "Starting SGX fixup for"
                 echo " ES${ES_REVISION}.x"
                 cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib
-                cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin    
+                cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin
                 echo "${ES_REVISION}" > /etc/powervr-esrev
         fi
         /usr/bin/pvrsrvinit
@@ -74,6 +83,16 @@ case $CPUTYPE in
 
         sgxfinish
         ;;
+"TI33XX")
+        sgxprepare
+
+        devmem2 0x44e01104 w 0x0 > /dev/null
+        devmem2 0x44e00904 w 0x2 > /dev/null
+
+        ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:8: | tail -n1 | awk -F': ' '{print $2}')"
+
+        sgxfinish
+        ;;
 "TI816x")
         sgxprepare
 
@@ -89,5 +108,3 @@ case $CPUTYPE in
         echo No SGX hardware, not starting PVR
         ;;
 esac
-
-