[meta-ti] [PATCH 4/4] libgles-omap3: Update cputype to support 3.12 and new device.

[Maupin, Chase]

Acked-by: Chase Maupin <chase.maupin at ti.com>

>-----Original Message-----
>From: meta-ti-bounces at yoctoproject.org [mailto:meta-ti-
>bounces at yoctoproject.org] On Behalf Of Cooper Jr., Franklin
>Sent: Tuesday, November 19, 2013 10:59 AM
>To: meta-ti at yoctoproject.org
>Subject: [meta-ti] [PATCH 4/4] libgles-omap3: Update cputype to
>support 3.12 and new device.
>
>Signed-off-by: Franklin S. Cooper Jr <fcooper at ti.com>
>---
> .../libgles/libgles-omap3-x11_5.00.00.01.bb        |    2 +-
> recipes-graphics/libgles/libgles-omap3/cputype     |   25
>++++++++++++-------
> .../libgles/libgles-omap3_5.00.00.01.bb            |    2 +-
> 3 files changed, 18 insertions(+), 11 deletions(-)
>
>diff --git a/recipes-graphics/libgles/libgles-omap3-
>x11_5.00.00.01.bb b/recipes-graphics/libgles/libgles-omap3-
>x11_5.00.00.01.bb
>index df53306..0bcf08c 100644
>--- a/recipes-graphics/libgles/libgles-omap3-x11_5.00.00.01.bb
>+++ b/recipes-graphics/libgles/libgles-omap3-x11_5.00.00.01.bb
>@@ -2,7 +2,7 @@ require libgles-omap3-x11.inc
>
> LICENSE = "TSPA"
>
>-PR = "${INC_PR}.0"
>+PR = "${INC_PR}.1"
>
> DEFAULT_PREFERENCE = "-1"
>
>diff --git a/recipes-graphics/libgles/libgles-omap3/cputype
>b/recipes-graphics/libgles/libgles-omap3/cputype
>index 4448c30..de534a8 100755
>--- a/recipes-graphics/libgles/libgles-omap3/cputype
>+++ b/recipes-graphics/libgles/libgles-omap3/cputype
>@@ -1,17 +1,24 @@
> #!/bin/sh
>
>+
>+legacy_machine_id() { # return the machine ID
>+        awk 'BEGIN { FS=": " } /Hardware/ \
>+                { gsub(" ", "_", $2); print tolower($2) } '
></proc/cpuinfo
>+}
>+
> machine_id() { # return the machine ID
>-	awk 'BEGIN { FS=": " } /Hardware/ \
>-		{ gsub(" ", "_", $2); print tolower($2) } '
></proc/cpuinfo
>+        cat /proc/cpuinfo | grep Hardware | awk -F" " '{ print $4
>}'
> }
>
>-if [ "$(machine_id)" = "ti8168evm" ] ; then
>-	echo TI816x
>-elif [ "$(machine_id)" = "am335xevm" ] ; then
>+if [ "$(machine_id)" = "ti8168evm" -o "$(legacy_machine_id)" =
>"ti8168evm" ] ; then
>+        echo TI816x
>+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/'
>+    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/'
> 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 de6ba55..cb96ca7 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"
>
>--
>1.7.0.4
>
>_______________________________________________
>meta-ti mailing list
>meta-ti at yoctoproject.org
>https://lists.yoctoproject.org/listinfo/meta-ti