[meta-ti] Denys Dmytriyenko : libgles-omap3: update cputype to support 3. 12 and AM43x device

[Arago Project git]

Module: meta-ti
Branch: dylan
Commit: 5ae405999c4fde790e68379d1b744a2173645872
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=5ae405999c4fde790e68379d1b744a2173645872

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Thu Nov 21 21:03:16 2013 -0500

libgles-omap3: update cputype to support 3.12 and AM43x device

Signed-off-by: Franklin S. Cooper Jr <fcooper at ti.com>
Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 recipes-graphics/libgles/libgles-omap3/cputype     |   18 +++++++++++++-----
 .../libgles/libgles-omap3_5.00.00.01.bb            |    2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3/cputype b/recipes-graphics/libgles/libgles-omap3/cputype
index 4448c30..35268a8 100755
--- a/recipes-graphics/libgles/libgles-omap3/cputype
+++ b/recipes-graphics/libgles/libgles-omap3/cputype
@@ -1,17 +1,25 @@
 #!/bin/sh
 
-machine_id() { # return the machine ID
+legacy_machine_id() { # return the machine ID
 	awk 'BEGIN { FS=": " } /Hardware/ \
 		{ gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
 }
 
-if [ "$(machine_id)" = "ti8168evm" ] ; then
+machine_id() { # return the machine ID
+	cat /proc/cpuinfo | grep Hardware | awk -F" " '{ print $4 }'
+}
+
+if [ "$(machine_id)" = "ti8168evm" -o "$(legacy_machine_id)" = "ti8168evm" ] ; then
 	echo TI816x
-elif [ "$(machine_id)" = "am335xevm" ] ; then
-    echo TI33XX
+elif [ "$(machine_id)" = "AM33XX" -o "$(legacy_machine_id)" = "am335xevm" ] ; then
+	echo TI33XX
+elif [ "$(machine_id)" = "AM43" ] ; then
+	echo TI43XX
 else
 	devmem2 0x4800244c | \
 	grep 'Read at address' | \
 	sed -e 's/.*): //' | \
-	sed -e 's/0x00005C00/OMAP3503/' -e 's/0x00001C00/OMAP3515/' -e 's/0x00004C00/OMAP3525/' -e 's/0x00000C00/OMAP3530/' -e 's/0x00005E00/OMAP3503/' -e 's/0x00001E00/OMAP3515/' -e 's/0x00004E00/OMAP3525/' -e 's/0x00000E00/OMAP3530/' -e 's/0x00000CC0/OMAP3530/'
+	sed -e 's/0x00005C00/OMAP3503/' -e 's/0x00001C00/OMAP3515/' -e 's/0x00004C00/OMAP3525/' -e 's/0x00000C00/OMAP3530/' \
+		-e 's/0x00005E00/OMAP3503/' -e 's/0x00001E00/OMAP3515/' -e 's/0x00004E00/OMAP3525/' -e 's/0x00000E00/OMAP3530/' \
+		-e 's/0x00000CC0/OMAP3530/'
 fi
diff --git a/recipes-graphics/libgles/libgles-omap3_5.00.00.01.bb b/recipes-graphics/libgles/libgles-omap3_5.00.00.01.bb
index be09ffa..7af67eb 100644
--- a/recipes-graphics/libgles/libgles-omap3_5.00.00.01.bb
+++ b/recipes-graphics/libgles/libgles-omap3_5.00.00.01.bb
@@ -2,7 +2,7 @@ require libgles-omap3-no-x.inc
 
 LICENSE = "TSPA"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"