[oe-commits] Koen Kooi : x-load: fall back to xM when detecting beagleboard revisions

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d33d29aad7b03cdd6e1621cc7d99d5e2269a07eb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d33d29aad7b03cdd6e1621cc7d99d5e2269a07eb

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Mar  8 08:52:26 2011 +0100

x-load: fall back to xM when detecting beagleboard revisions

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/x-load/x-load-git/xmc.patch |   52 +++++++++++++++++++++++++++++++++++
 recipes/x-load/x-load_git.bb        |    3 +-
 2 files changed, 54 insertions(+), 1 deletions(-)

diff --git a/recipes/x-load/x-load-git/xmc.patch b/recipes/x-load/x-load-git/xmc.patch
new file mode 100644
index 0000000..bddcb8f
--- /dev/null
+++ b/recipes/x-load/x-load-git/xmc.patch
@@ -0,0 +1,52 @@
+From b35937bf29c828e311f1d9bb1385bd32d34ec060 Mon Sep 17 00:00:00 2001
+From: Jason Kridner <jkridner at beagleboard.org>
+Date: Mon, 7 Mar 2011 19:31:15 -0600
+Subject: [PATCH] Forced newer revisions to default to xM.
+
+---
+ board/omap3530beagle/omap3530beagle.c |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
+index 1b3d8c7..d55d32e 100644
+--- a/board/omap3530beagle/omap3530beagle.c
++++ b/board/omap3530beagle/omap3530beagle.c
+@@ -212,6 +212,7 @@ u32 cpu_is_3410(void)
+  *		GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3
+  *		GPIO173, GPIO172, GPIO171: 1 0 1 => C4
+  *		GPIO173, GPIO172, GPIO171: 0 0 0 => XM
++ *		default                          => XM
+  ******************************************/
+ int beagle_revision(void)
+ {
+@@ -227,6 +228,18 @@ int beagle_revision(void)
+ 	rev = omap_get_gpio_datain(173) << 2 |
+ 		omap_get_gpio_datain(172) << 1 |
+ 		omap_get_gpio_datain(171);
++
++	/* Default newer board revisions to XM */
++	switch(rev) {
++	case REVISION_AXBX:
++	case REVISION_CX:
++	case REVISION_C4:
++		break;
++	case REVISION_XM:
++	default:
++		rev = REVISION_XM;
++	}
++
+ 	omap_free_gpio(171);
+ 	omap_free_gpio(172);
+ 	omap_free_gpio(173);
+@@ -662,7 +675,7 @@ int misc_init_r(void)
+ 		printf("Beagle Rev C4\n");
+ 		break;
+ 	case REVISION_XM:
+-		printf("Beagle xM Rev A\n");
++		printf("Beagle xM\n");
+ 		break;
+ 	default:
+ 		printf("Beagle unknown 0x%02x\n", rev);
+-- 
+1.6.1
+
diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb
index 523251e..a181b3c 100644
--- a/recipes/x-load/x-load_git.bb
+++ b/recipes/x-load/x-load_git.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_omap3-pandora = "-1"
 FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}"
 
 PV = "1.44+${PR}+gitr${SRCREV}"
-PR ="r20"
+PR ="r21"
 PE = "1"
 
 SRCREV = "24b8b7f41a83540433024854736518876257672c"
@@ -15,6 +15,7 @@ SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git
            file://0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch \
            file://0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch \
            file://0005-omap4-Make-1GHz-as-default-MPU-clock.patch \
+           file://xmc.patch \
           "
 
 XLOAD_MACHINE_beagleboard = "omap3530beagle_config"