aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-03-08 08:52:26 +0100
committerKoen Kooi <koen@openembedded.org>2011-03-08 08:52:26 +0100
commitd33d29aad7b03cdd6e1621cc7d99d5e2269a07eb (patch)
tree6b7f0b35334f9cb716f93197f119fc3c7abbdbb7
parentc0aeb60414816b0c1daa46daa67eb20ce59a2a10 (diff)
downloadopenembedded-d33d29aad7b03cdd6e1621cc7d99d5e2269a07eb.tar.gz
openembedded-d33d29aad7b03cdd6e1621cc7d99d5e2269a07eb.tar.bz2
openembedded-d33d29aad7b03cdd6e1621cc7d99d5e2269a07eb.zip
x-load: fall back to xM when detecting beagleboard revisions
Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--recipes/x-load/x-load-git/xmc.patch52
-rw-r--r--recipes/x-load/x-load_git.bb3
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 0000000000..bddcb8fc7f
--- /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@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 523251e5c5..a181b3c755 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"