u-boot git: update beagleboard patches, rebase onto denx git

1 files changed, 87 insertions, 0 deletions

diff --git a/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch
new file mode 100644
index 0000000000..2ee844b9ff
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch
@@ -0,0 +1,87 @@
+From 8ad472139f7b8b7c59c0192f3e2f50a20beadf59 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Mon, 3 May 2010 10:17:41 +0200
+Subject: [PATCH 37/37] OMAP3: beagle: pass expansionboard name in bootargs
+
+This makes it possible to do in-kernel fixups for expansionboards like reclaiming GPIOs
+---
+ board/ti/beagle/beagle.c       |    7 +++++++
+ include/configs/omap3_beagle.h |    3 +++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 9300984..556e995 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -172,33 +172,40 @@ int misc_init_r(void)
+ 			printf("Recognized Tincantools Zippy expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
++			setenv("buddy", "zippy");
+ 			break;
+ 		case TINCANTOOLS_ZIPPY2:
+ 			printf("Recognized Tincantools Zippy2 expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
++			setenv("buddy", "zippy2");
+ 			break;
+ 		case TINCANTOOLS_TRAINER:
+ 			printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			MUX_TINCANTOOLS_ZIPPY();
+ 			MUX_TINCANTOOLS_TRAINER();
++			setenv("buddy", "trainer");
+ 			break;
+ 		case TINCANTOOLS_SHOWDOG:
+ 			printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n",
+ 				expansion_config.revision, expansion_config.fab_revision);
+ 			/* Place holder for DSS2 definition for showdog lcd */
+ 			setenv("defaultdisplay", "showdoglcd");
++			setenv("buddy", "showdog");
+ 			break;
+ 		case KBADC_BEAGLEFPGA:
+ 			printf("Recognized KBADC Beagle FPGA board\n");
+ 			MUX_KBADC_BEAGLEFPGA();
++			setenv("buddy", "beaglefpga");
+ 			break;
+ 		case BEAGLE_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
++			setenv("buddy", "none");
+ 			break;
+ 		default:
+ 			printf("Unrecognized expansion board: %x\n", expansion_config.device_vendor);
++			setenv("buddy", "unknown");
+ 	}
+ 
+ 	if (expansion_config.content == 1)
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 93a6a5a..affabf1 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -185,6 +185,7 @@
+ 	"usbtty=cdc_acm\0" \
+ 	"console=ttyS2,115200n8\0" \
+ 	"mpurate=500\0" \
++	"buddy=none\0" \
+ 	"vram=12M\0" \
+ 	"dvimode=640x480MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+@@ -194,6 +195,7 @@
+ 	"nandrootfstype=jffs2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"mpurate=${mpurate} " \
++		"buddy=${buddy} "\
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+@@ -201,6 +203,7 @@
+ 		"rootfstype=${mmcrootfstype}\0" \
+ 	"nandargs=setenv bootargs console=${console} " \
+ 		"mpurate=${mpurate} " \
++		"buddy=${buddy} "\
+ 		"vram=${vram} " \
+ 		"omapfb.mode=dvi:${dvimode} " \
+ 		"omapdss.def_disp=${defaultdisplay} " \
+-- 
+1.6.6.1
+