u-boot git: sync with OE for beagleboard

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2026-06-04 18:00:36 +00:00 · 2011-02-08 14:10:13 +01:00
parent 46f000fb0e
commit e377e1378c
52 changed files with 250 additions and 177 deletions
@@ -1,7 +1,7 @@
-From 9c1581dd7f6057d5d25d6b2dcf8bacef95d526d2 Mon Sep 17 00:00:00 2001
+From 5b5eb18bfb80fa9595eb258a911a94f2807e7497 Mon Sep 17 00:00:00 2001
 From: Syed Mohammed Khasim <khasim@ti.com>
 Date: Mon, 18 Jan 2010 18:11:14 +0530
-Subject: [PATCH] Enable I2C bus switching
+Subject: [PATCH 01/51] Enable I2C bus switching

 OMAP3 supports Multiple I2C channels, this patch allows
 us to use i2c dev <bus no> command to switch between busses.
@@ -15,7 +15,7 @@ Acked-by: Heiko Schocher <hs@denx.de>
 2 files changed, 11 insertions(+), 0 deletions(-)

 diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
-index f00468d..0af230d 100644
+index ff18991..e8c8184 100644
 --- a/drivers/i2c/omap24xx_i2c.c
 +++ b/drivers/i2c/omap24xx_i2c.c
@@ -435,3 +435,8 @@ int i2c_set_bus_num(unsigned int bus)
@@ -28,10 +28,10 @@ index f00468d..0af230d 100644
 +	return (int) current_bus;
 +}
 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index ad73a66..1a76004 100644
+index 08d79ac..d522c77 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -113,6 +113,12 @@
+@@ -100,6 +100,12 @@
 /* DDR - I use Micron DDR */
 #define CONFIG_OMAP3_MICRON_DDR		1
 
@@ -45,5 +45,5 @@ index ad73a66..1a76004 100644
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
 -- 
-1.6.1
+1.6.6.1

@@ -1,7 +1,7 @@
-From 59c9245c9a52954c8c084e257bbe55443201614b Mon Sep 17 00:00:00 2001
+From 8cea9443be01ccc2525ff1de17b0dddd7c27984e Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Wed, 10 Feb 2010 14:40:56 -0800
-Subject: [PATCH 02/37] OMAP3: add board revision detection for Overo
+Subject: [PATCH 02/51] OMAP3: add board revision detection for Overo

 ---
 board/overo/overo.c |   90 +++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1,7 +1,7 @@
-From 9db5da6e8a0d6fb973b71902525ad3298faa39d9 Mon Sep 17 00:00:00 2001
+From fae6228e203436ce0d82ce32da769bd91206865f Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Wed, 10 Feb 2010 14:51:48 -0800
-Subject: [PATCH 03/37] OMAP3: update Beagle revision detection to recognize C4 boards
+Subject: [PATCH 03/51] OMAP3: update Beagle revision detection to recognize C4 boards

 ---
 board/ti/beagle/beagle.c |   77 +++++++++++++++++++++++++++-------------------
@@ -1,7 +1,7 @@
-From efc587fb24a5246f5a436a057320687a1b7847c6 Mon Sep 17 00:00:00 2001
+From a1a4ba7a5fce36522a994cb06d6d76931964578c Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Wed, 10 Feb 2010 15:23:19 -0800
-Subject: [PATCH 04/37] OMAP3: Set VAUX2 to 1.8V for EHCI PHY on Beagle Rev C4 boards
+Subject: [PATCH 04/51] OMAP3: Set VAUX2 to 1.8V for EHCI PHY on Beagle Rev C4 boards

 ---
 board/ti/beagle/beagle.c |    5 +++++
@@ -1,7 +1,7 @@
-From 27072274450ea8de1994744782397452b99814cc Mon Sep 17 00:00:00 2001
+From 13ed8be9848adff30bcfdcbe16bce3d2c6bb02f1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Wed, 3 Feb 2010 12:26:30 -0800
-Subject: [PATCH 05/37] OMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0
+Subject: [PATCH 05/51] OMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0

 ---
 cpu/arm_cortexa8/omap3/sys_info.c  |   24 ++++++++++++++++++++++--
@@ -1,7 +1,7 @@
-From 1b082bb4a8ba5b7bee727baf3cd048e1785c8abd Mon Sep 17 00:00:00 2001
+From b03bad6826a2f3a0a03f6cdd5682e0a628fff851 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Wed, 3 Feb 2010 14:39:14 -0800
-Subject: [PATCH 06/37] OMAP3: add mpurate boot arg for overo and beagle
+Subject: [PATCH 06/51] OMAP3: add mpurate boot arg for overo and beagle

 allows one to set the omap clock rate via "setenv mpurate 720" for example
 ---
@@ -10,10 +10,10 @@ allows one to set the omap clock rate via "setenv mpurate 720" for example
 2 files changed, 6 insertions(+), 0 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 87e3dd0..ce347cd 100644
+index d522c77..35ae8af 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -182,6 +182,7 @@
+@@ -187,6 +187,7 @@
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
@@ -21,7 +21,7 @@ index 87e3dd0..ce347cd 100644
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16@60\0" \
 	"defaultdisplay=dvi\0" \
-@@ -190,6 +191,7 @@
+@@ -195,6 +196,7 @@
 	"nandroot=/dev/mtdblock4 rw\0" \
 	"nandrootfstype=jffs2\0" \
 	"mmcargs=setenv bootargs console=${console} " \
@@ -29,7 +29,7 @@ index 87e3dd0..ce347cd 100644
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
 		"omapfb.debug=y " \
-@@ -197,6 +199,7 @@
+@@ -202,6 +204,7 @@
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
 	"nandargs=setenv bootargs console=${console} " \
@@ -38,10 +38,10 @@ index 87e3dd0..ce347cd 100644
 		"omapfb.mode=dvi:${dvimode} " \
 		"omapfb.debug=y " \
 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
-index 0d24758..295cce6 100644
+index a43500b..113c6df 100644
 --- a/include/configs/omap3_overo.h
 +++ b/include/configs/omap3_overo.h
-@@ -152,6 +152,7 @@
+@@ -151,6 +151,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
@@ -49,7 +49,7 @@ index 0d24758..295cce6 100644
 	"vram=12M\0" \
 	"dvimode=1024x768MR-16@60\0" \
 	"defaultdisplay=dvi\0" \
-@@ -160,6 +161,7 @@
+@@ -159,6 +160,7 @@
 	"nandroot=/dev/mtdblock4 rw\0" \
 	"nandrootfstype=jffs2\0" \
 	"mmcargs=setenv bootargs console=${console} " \
@@ -57,7 +57,7 @@ index 0d24758..295cce6 100644
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
 		"omapfb.debug=y " \
-@@ -167,6 +169,7 @@
+@@ -166,6 +168,7 @@
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
 	"nandargs=setenv bootargs console=${console} " \
@@ -1,7 +1,7 @@
-From 129dccd106ea5862f3ff25c368102bf656472f7f Mon Sep 17 00:00:00 2001
+From f1ad90ae5fd07257ea42aa771e16a7798cd440bb Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Fri, 12 Feb 2010 12:17:48 -0800
-Subject: [PATCH 07/37] OMAP3: detect expansion board type/version using eeprom contents
+Subject: [PATCH 07/51] OMAP3: detect expansion board type/version using eeprom contents

 ---
 board/overo/overo.c |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1,7 +1,7 @@
-From 4fb2bbcae8f283c46e762aa93b25cbbd55bab8b6 Mon Sep 17 00:00:00 2001
+From 831504a9514c2cb4b1dc8c9a261fd4d1a037235f Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 16 Feb 2010 09:58:01 -0800
-Subject: [PATCH 08/37] OMAP3: Overo: enable config eeprom to set u-boot env variable
+Subject: [PATCH 08/51] OMAP3: Overo: enable config eeprom to set u-boot env variable

 ---
 board/overo/overo.c |   21 +++++++++++++--------
@@ -1,7 +1,7 @@
-From 0ddd7f44f04b47d16d33a6b232b288ebdb1c9992 Mon Sep 17 00:00:00 2001
+From 500787d2999e23cf185808f611af61745c2746a3 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 16 Feb 2010 10:00:45 -0800
-Subject: [PATCH 09/37] OMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux
+Subject: [PATCH 09/51] OMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux

 ---
 board/overo/overo.h |    4 ++--
@@ -1,14 +1,14 @@
-From 405a5a151c8d42f157dc48731f6e607675156774 Mon Sep 17 00:00:00 2001
+From 6ced8e0d859ea9cddbc2ec4a94a4c7394f1ee4c5 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 16 Feb 2010 10:03:14 -0800
-Subject: [PATCH 10/37] OMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz
+Subject: [PATCH 10/51] OMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz

 ---
 include/configs/omap3_overo.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
-index 295cce6..fdbeb67 100644
+index 113c6df..27b5476 100644
 --- a/include/configs/omap3_overo.h
 +++ b/include/configs/omap3_overo.h
@@ -112,7 +112,7 @@
@@ -1,14 +1,14 @@
-From 991f54c9da846ab9571c256adf42d8d80d044bdc Mon Sep 17 00:00:00 2001
+From f054db5f2a8eedbeaf8c6045d0bbafde5aca3efc Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 16 Feb 2010 10:04:30 -0800
-Subject: [PATCH 11/37] OMAP3:  trim excessively long delays in i2c driver
+Subject: [PATCH 11/51] OMAP3: trim excessively long delays in i2c driver

 ---
 drivers/i2c/omap24xx_i2c.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
-index 30a8b4c..ba47fc4 100644
+index e8c8184..0af230d 100644
 --- a/drivers/i2c/omap24xx_i2c.c
 +++ b/drivers/i2c/omap24xx_i2c.c
@@ -148,7 +148,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
@@ -1,7 +1,7 @@
-From ad1a2c047554deae2e1608d025c4f6891cf8f116 Mon Sep 17 00:00:00 2001
+From 2c02d9b024b58bbea920d3d6c40d62b30e448f60 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Fri, 26 Feb 2010 12:40:26 -0800
-Subject: [PATCH 12/37] OMAP3: Overo: allow expansion boards with any vendor ID
+Subject: [PATCH 12/51] OMAP3: Overo: allow expansion boards with any vendor ID

 ---
 board/overo/overo.c |   10 +++-------
@@ -1,7 +1,7 @@
-From 305e2cb16f4f6e8c7f13120e6a98bb1e999c764f Mon Sep 17 00:00:00 2001
+From 90119d705d2c56254d4b27efb8e8c61e62f014c1 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Fri, 26 Feb 2010 12:42:30 -0800
-Subject: [PATCH 13/37] OMAP3: Overo: change address of expansion eeprom to 0x51 so as to not conflict with EDID address
+Subject: [PATCH 13/51] OMAP3: Overo: change address of expansion eeprom to 0x51 so as to not conflict with EDID address

 ---
 board/overo/overo.c |    2 +-
@@ -1,7 +1,7 @@
-From 63de99ce613bbfce792ee46d14b324273e6a0d29 Mon Sep 17 00:00:00 2001
+From 7f50d09f9a00b7f2a392a5b0b9f2f19a96a90c16 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:04:50 -0700
-Subject: [PATCH 14/37] OMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already done this
+Subject: [PATCH 14/51] OMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already done this

 ---
 cpu/arm_cortexa8/omap3/board.c |   19 +++++++++----------
@@ -1,7 +1,7 @@
-From f2e3d22fb1963d08844edee45f7d7d6beba32152 Mon Sep 17 00:00:00 2001
+From 379ff04432ffdef234c2f85b1801cf7df2d3d5ee Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:06:49 -0700
-Subject: [PATCH 15/37] OMAP3: mem.c: enhance the RAM test
+Subject: [PATCH 15/51] OMAP3: mem.c: enhance the RAM test

 ---
 cpu/arm_cortexa8/omap3/mem.c |   28 +++++++++++++++-------------
@@ -1,7 +1,7 @@
-From 794e4aa6a5aa5fbe71b08bfe8f5f5f65078fbc68 Mon Sep 17 00:00:00 2001
+From a9b4ba0446bd55d98243de2f3e3a747f8842811f Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:12:16 -0700
-Subject: [PATCH 16/37] env_nand.c:  fail gracefully if no nand is present
+Subject: [PATCH 16/51] env_nand.c: fail gracefully if no nand is present

 ---
 common/env_nand.c |    4 ++++
@@ -1,7 +1,7 @@
-From 34622e1e89b615c999480ab48ec004c16f8ca2d5 Mon Sep 17 00:00:00 2001
+From 4c1682016b61262456acb9386ef69d0da4243db9 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:15:29 -0700
-Subject: [PATCH 17/37] OMAP3: add definitions to support sysinfo cpu and cpu family detection
+Subject: [PATCH 17/51] OMAP3: add definitions to support sysinfo cpu and cpu family detection

 ---
 include/asm-arm/arch-omap3/cpu.h   |    6 ------
@@ -1,7 +1,7 @@
-From 8480eb0272865078290146031e09eb70baed3f6e Mon Sep 17 00:00:00 2001
+From f8a42576fac8349ae8ff9d6673b229f6b3103798 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:17:59 -0700
-Subject: [PATCH 18/37] OMAP3 sys_info: update cpu detection for 36XX/37XX
+Subject: [PATCH 18/51] OMAP3 sys_info: update cpu detection for 36XX/37XX

 ---
 cpu/arm_cortexa8/omap3/sys_info.c |  137 ++++++++++++++++++++++++++++---------
@@ -1,7 +1,7 @@
-From 0bf419a0faa8c9dc73d7a84f93d7fcb89be3ea21 Mon Sep 17 00:00:00 2001
+From 276236da04d67dfad61ccab5d4700613ae8527f9 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:20:56 -0700
-Subject: [PATCH 19/37] OMAP3: clocks: update clock setup for 36XX/37XX
+Subject: [PATCH 19/51] OMAP3: clocks: update clock setup for 36XX/37XX

 ---
 cpu/arm_cortexa8/omap3/clock.c            |  559 +++++++++++++++++++++--------
@@ -675,7 +675,7 @@ index 6330c9e..538a183 100644
 }
 +
 diff --git a/cpu/arm_cortexa8/omap3/lowlevel_init.S b/cpu/arm_cortexa8/omap3/lowlevel_init.S
-index 73063ec..2045e4e 100644
+index 73063ec..061d75f 100644
 --- a/cpu/arm_cortexa8/omap3/lowlevel_init.S
 +++ b/cpu/arm_cortexa8/omap3/lowlevel_init.S
@@ -359,3 +359,72 @@ per_dpll_param:
@@ -1,7 +1,7 @@
-From 27c6c30dbb5de0c0ed30ceaf69bb0e9f12149c03 Mon Sep 17 00:00:00 2001
+From 8a8738a7d042a80ddef68a9683d7dda77bed8765 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Tue, 23 Mar 2010 09:21:49 -0700
-Subject: [PATCH 20/37] OMAP3: beagle: add support for Beagle xM
+Subject: [PATCH 20/51] OMAP3: beagle: add support for Beagle xM

 ---
 board/ti/beagle/beagle.c       |   23 +++++++++++++++--------
@@ -121,10 +121,10 @@ index d95fd78..fd06d46 100644
 +
 #endif
 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index ce347cd..bba36df 100644
+index 35ae8af..1370a29 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -157,6 +157,7 @@
+@@ -162,6 +162,7 @@
 /*
  * Board NAND Info.
  */
@@ -1,7 +1,7 @@
-From e26b222adeea78777a89e9b0d0aefed67cde7d55 Mon Sep 17 00:00:00 2001
+From 0fd26c84173c9a589c6cd9c0db6d2200e769134b Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 25 Mar 2010 06:54:47 -0700
-Subject: [PATCH 21/37] OMAP3: Beagle, Overo: remove omapfb.debug=y from default env
+Subject: [PATCH 21/51] OMAP3: Beagle, Overo: remove omapfb.debug=y from default env

 ---
 include/configs/omap3_beagle.h |    2 --
@@ -9,10 +9,10 @@ Subject: [PATCH 21/37] OMAP3: Beagle, Overo: remove omapfb.debug=y from default
 2 files changed, 0 insertions(+), 4 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index bba36df..c156cea 100644
+index 1370a29..8bedf7d 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -195,7 +195,6 @@
+@@ -200,7 +200,6 @@
 		"mpurate=${mpurate} " \
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
@@ -20,7 +20,7 @@ index bba36df..c156cea 100644
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
-@@ -203,7 +202,6 @@
+@@ -208,7 +207,6 @@
 		"mpurate=${mpurate} " \
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
@@ -29,10 +29,10 @@ index bba36df..c156cea 100644
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
-index fdbeb67..418e2ea 100644
+index 27b5476..118e886 100644
 --- a/include/configs/omap3_overo.h
 +++ b/include/configs/omap3_overo.h
-@@ -164,7 +164,6 @@
+@@ -163,7 +163,6 @@
 		"mpurate=${mpurate} " \
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
@@ -40,7 +40,7 @@ index fdbeb67..418e2ea 100644
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
-@@ -172,7 +171,6 @@
+@@ -171,7 +170,6 @@
 		"mpurate=${mpurate} " \
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
@@ -1,7 +1,7 @@
-From 851d35fab7f93400a1d714524b5e986206d9b0c4 Mon Sep 17 00:00:00 2001
+From b48754f4c77924a9351867e17e2f09fbe5a83b82 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 25 Mar 2010 16:07:23 +0100
-Subject: [PATCH 22/37] OMAP3: beagle: implement expansionboard detection based on board/overo.c code
+Subject: [PATCH 22/51] OMAP3: beagle: implement expansionboard detection based on board/overo.c code

 ---
 board/ti/beagle/beagle.c |   78 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -1,7 +1,7 @@
-From 4b07f3a9f045453e5e7b5950e721ed35d9bd308a Mon Sep 17 00:00:00 2001
+From 653c13d956b189c05e6c02077dbd85cba8ff490b Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Wed, 31 Mar 2010 14:24:25 +0200
-Subject: [PATCH 23/37] beagleboard: display message about I2C errors being expected when no expansion boards are present
+Subject: [PATCH 23/51] beagleboard: display message about I2C errors being expected when no expansion boards are present

 ---
 board/ti/beagle/beagle.c |    3 +++
@@ -1,7 +1,7 @@
-From a4fa85edf5ff6aa6a06f437acc8694dd866f6618 Mon Sep 17 00:00:00 2001
+From a0f21f7418dfa81a40bf99b7e926153a310ba457 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sun, 11 Apr 2010 12:14:43 +0200
-Subject: [PATCH 24/37] beagleboard: fix TCT expansionboard IDs
+Subject: [PATCH 24/51] beagleboard: fix TCT expansionboard IDs

 ---
 board/ti/beagle/beagle.c |    4 ++--
@@ -1,7 +1,7 @@
-From 10bffe78f0ef6cb450ecea717dce8d636982bc86 Mon Sep 17 00:00:00 2001
+From afa9025604773b90831cb93a5c80db8d2b8eed4b Mon Sep 17 00:00:00 2001
 From: Syed Mohammed Khasim <khasim@ti.com>
 Date: Tue, 12 Jan 2010 23:57:28 +0530
-Subject: [PATCH 25/37] Add DSS driver for OMAP3
+Subject: [PATCH 25/51] Add DSS driver for OMAP3

 Supports dynamic panel configuration
 Supports dynamic tv standard selection
@@ -1,7 +1,7 @@
-From a8adb8e29aba9d2c83731839063f1381fce3906c Mon Sep 17 00:00:00 2001
+From 89a879905e59c837626b6a9425bcc27b097e02ad Mon Sep 17 00:00:00 2001
 From: Syed Mohammed Khasim <khasim@ti.com>
 Date: Sun, 11 Apr 2010 17:44:39 +0200
-Subject: [PATCH 26/37] Enable DSS driver for Beagle
+Subject: [PATCH 26/51] Enable DSS driver for Beagle

 Configures DSS to display color bar on Svideo
 Configures DSS to display background color on DVID
@@ -142,10 +142,10 @@ index ec4f831..69f9398 100644
 +
 #endif
 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index c156cea..7bcbe9b 100644
+index 8bedf7d..52d727a 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -131,6 +131,7 @@
+@@ -137,6 +137,7 @@
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
@@ -1,7 +1,7 @@
-From 85d4ffbc3a12b28cae00fc88d4adba7df4907fe4 Mon Sep 17 00:00:00 2001
+From 4aca3c70a18da58e263b08e37b288a06b2b6655c Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 13 Apr 2010 22:04:07 +0200
-Subject: [PATCH 27/37] beagleboardXM: don't set mpurate on xM in bootargs
+Subject: [PATCH 27/51] beagleboardXM: don't set mpurate on xM in bootargs

 ---
 board/ti/beagle/beagle.c |    1 -
@@ -1,7 +1,7 @@
-From c18bda32fdb048ea38b7ff579f365ea8858053d7 Mon Sep 17 00:00:00 2001
+From 72e1ab470e483c91ab3aa38bec31faf3dad52735 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 12:08:00 +0100
-Subject: [PATCH 28/37] OMAP3: fix and clean up L2 cache enable/disable functions
+Subject: [PATCH 28/51] OMAP3: fix and clean up L2 cache enable/disable functions

 On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode,
 so an SMC call to the ROM monitor is required.  On later versions,
@@ -1,7 +1,7 @@
-From 6ddb5d4e28801907af7be39e47d502fd5c8e73e1 Mon Sep 17 00:00:00 2001
+From 1e795a2c3e44002c3512222dd3da07ac3ea42d7d Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 16:49:57 +0100
-Subject: [PATCH 29/37] OMAP3: convert setup_auxcr() to pure asm
+Subject: [PATCH 29/51] OMAP3: convert setup_auxcr() to pure asm

 This function consists entirely of inline asm statements, so writing
 it directly in a .S file is simpler. Additionally, the inline asm is
@@ -1,7 +1,7 @@
-From 4e7bc59affc2a71de40259330e27e62181993968 Mon Sep 17 00:00:00 2001
+From fd092c7f2286fab34cf42c6c56360ae7794dbc7f Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 17:10:28 +0100
-Subject: [PATCH 30/37] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions
+Subject: [PATCH 30/51] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions

 The workarounds for errata 621766 and 725233 should only be applied
 on affected Cortex-A8 revisions.  Recent chips use r3px cores where
@@ -1,7 +1,7 @@
-From bbfb38ccd1e2bb19a1eb698bd37cd1ab50c87b37 Mon Sep 17 00:00:00 2001
+From ccbe10687806b6504c87bd3ad80bd406bc6263f4 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 23 Apr 2010 10:50:43 +0200
-Subject: [PATCH 31/37] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
+Subject: [PATCH 31/51] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs

 ---
 board/ti/beagle/beagle.c |    8 ++++++++
@@ -1,7 +1,7 @@
-From ae05ca488390671516bd4ed021eb43901fee740f Mon Sep 17 00:00:00 2001
+From 0d2821af767b7cfe1a5d868a14f8a18e01070e37 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 27 Apr 2010 13:44:16 +0200
-Subject: [PATCH 32/37] OMAP3: beagle: set mpurate to 600 for revB and revC1-3
+Subject: [PATCH 32/51] OMAP3: beagle: set mpurate to 600 for revB and revC1-3

 ---
 board/ti/beagle/beagle.c |    2 ++
@@ -1,7 +1,7 @@
-From caf18bc716d77d7bf2c75bc58ffbcbf09ae79f2b Mon Sep 17 00:00:00 2001
+From f4f92e1f72e2bcab85f205c66f0725a677e192e2 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 27 Apr 2010 13:45:28 +0200
-Subject: [PATCH 33/37] OMAP3: beagle: prettify expansionboard message a bit
+Subject: [PATCH 33/51] OMAP3: beagle: prettify expansionboard message a bit

 ---
 board/ti/beagle/beagle.c |    2 +-
@@ -1,7 +1,7 @@
-From 8580a3eafe3351e3c0f1ca3d0bc959bbeec40e28 Mon Sep 17 00:00:00 2001
+From d6d6f29e339b5d014f91870b35985a372dd330f2 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Tue, 27 Apr 2010 18:25:57 +0200
-Subject: [PATCH 34/37] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard
+Subject: [PATCH 34/51] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard

 ---
 board/ti/beagle/beagle.c |    2 ++
@@ -1,7 +1,7 @@
-From c45e93aef4d54b262f0d8e1ecf6b111f5e1c2a4c Mon Sep 17 00:00:00 2001
+From 442e5d80723e2772f38fe473d32287200d802907 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 30 Apr 2010 13:25:41 +0200
-Subject: [PATCH 35/37] OMAP3: Beagle: set mpurate to 1000 for xM
+Subject: [PATCH 35/51] OMAP3: Beagle: set mpurate to 1000 for xM

 ---
 board/ti/beagle/beagle.c |    1 +
@@ -1,17 +1,17 @@
-From 39f15722db5595411ec085e36b7fd7657415a554 Mon Sep 17 00:00:00 2001
+From 13b74d6ec2b88620515d0060f6276f744f058e44 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 30 Apr 2010 13:26:01 +0200
-Subject: [PATCH 36/37] OMAP3: Beagle: decrease bootdelay to 3, use VGA for default resolution
+Subject: [PATCH 36/51] OMAP3: Beagle: decrease bootdelay to 3, use VGA for default resolution

 ---
 include/configs/omap3_beagle.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 7bcbe9b..93a6a5a 100644
+index 52d727a..47bc971 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -178,7 +178,7 @@
+@@ -183,7 +183,7 @@
 							/* partition */
 
 /* Environment information */
@@ -20,7 +20,7 @@ index 7bcbe9b..93a6a5a 100644
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
-@@ -186,7 +186,7 @@
+@@ -191,7 +191,7 @@
 	"console=ttyS2,115200n8\0" \
 	"mpurate=500\0" \
 	"vram=12M\0" \
@@ -1,7 +1,7 @@
-From 8ad472139f7b8b7c59c0192f3e2f50a20beadf59 Mon Sep 17 00:00:00 2001
+From 02dba49bdab65e1a96fd4593f5847b38252b66e0 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
+Subject: [PATCH 37/51] OMAP3: beagle: pass expansionboard name in bootargs

 This makes it possible to do in-kernel fixups for expansionboards like reclaiming GPIOs
 ---
@@ -55,10 +55,10 @@ index 9300984..556e995 100644
 
 	if (expansion_config.content == 1)
 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 93a6a5a..affabf1 100644
+index 47bc971..8ad52aa 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -185,6 +185,7 @@
+@@ -190,6 +190,7 @@
 	"usbtty=cdc_acm\0" \
 	"console=ttyS2,115200n8\0" \
 	"mpurate=500\0" \
@@ -66,7 +66,7 @@ index 93a6a5a..affabf1 100644
 	"vram=12M\0" \
 	"dvimode=640x480MR-16@60\0" \
 	"defaultdisplay=dvi\0" \
-@@ -194,6 +195,7 @@
+@@ -199,6 +200,7 @@
 	"nandrootfstype=jffs2\0" \
 	"mmcargs=setenv bootargs console=${console} " \
 		"mpurate=${mpurate} " \
@@ -74,7 +74,7 @@ index 93a6a5a..affabf1 100644
 		"vram=${vram} " \
 		"omapfb.mode=dvi:${dvimode} " \
 		"omapdss.def_disp=${defaultdisplay} " \
-@@ -201,6 +203,7 @@
+@@ -206,6 +208,7 @@
 		"rootfstype=${mmcrootfstype}\0" \
 	"nandargs=setenv bootargs console=${console} " \
 		"mpurate=${mpurate} " \
@@ -1,7 +1,7 @@
-From 9a5d5518c3d3844cc49cf2d9ef5aeabca1e87c30 Mon Sep 17 00:00:00 2001
+From 94462a5c200adbad2c4fc47d7fc0ca24aeb14a2a Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Wed, 5 May 2010 14:53:49 -0500
-Subject: [PATCH 38/38] Added configurations for xM Rev A board
+Subject: [PATCH 38/51] Added configurations for xM Rev A board

 This defaults to "on" condition for USB and DVI.  May want to revise for
 power savings.
@@ -1,7 +1,7 @@
-From c48581ecc0b060e4c1b5fa973d053e81e18f676b Mon Sep 17 00:00:00 2001
+From 4b5bb4a7656dc1c4a1b985b6f5454c58ad060112 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Thu, 3 Jun 2010 19:50:57 +0200
-Subject: [PATCH 39/39] OMAP3: beagle: setenv beaglerev for AxBx/Cx/xMA for better bootscripts
+Subject: [PATCH 39/51] OMAP3: beagle: setenv beaglerev for AxBx/Cx/xMA for better bootscripts

 ---
 board/ti/beagle/beagle.c |    4 ++++
@@ -1,7 +1,7 @@
-From 7252b81ec10aea48672f66e33cb6962b98fb0782 Mon Sep 17 00:00:00 2001
+From 0dd14c6a6f40cb47fd8517e9e9d48f0a119e9aa9 Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Thu, 29 Apr 2010 10:28:14 -0700
-Subject: [PATCH] OMAP: mmc: add support for second and third mmc channels
+Subject: [PATCH 40/51] OMAP: mmc: add support for second and third mmc channels

 Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV

@@ -122,5 +122,5 @@ index aa751c9..43dd705 100644
 typedef struct hsmmc {
 	unsigned char res1[0x10];
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,16 +1,15 @@
-From 629a01965677e680ffa1fe76579ace7f69dd45b9 Mon Sep 17 00:00:00 2001
+From 8da9e2bac6daf2d61d7ca9d689790fc9ce5de9cb Mon Sep 17 00:00:00 2001
 From: Steve Sakoman <steve@sakoman.com>
 Date: Fri, 7 May 2010 07:40:26 -0700
-Subject: [PATCH] OMAP3: Beagle: enable support for second and third mmc channels
+Subject: [PATCH 41/51] OMAP3: Beagle: enable support for second and third mmc channels

 Based on 629a01965677e680ffa1fe76579ace7f69dd45b9, but removed BOOTDELAY change.
-
 ---
- include/configs/omap3_beagle.h |   8 +++++---
+ include/configs/omap3_beagle.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index f2d0f53..74d4159 100644
+index 8ad52aa..e4c88f2 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
@@ -95,6 +95,7 @@
@@ -21,15 +20,15 @@ index f2d0f53..74d4159 100644
 #define CONFIG_DOS_PARTITION		1
 
 /* DDR - I use Micron DDR */
-@@ -186,6 +187,7 @@
+@@ -194,6 +195,7 @@
 	"vram=12M\0" \
- 	"dvimode=1024x768MR-16@60\0" \
+ 	"dvimode=640x480MR-16@60\0" \
 	"defaultdisplay=dvi\0" \
 +	"mmcdev=1\0" \
 	"mmcroot=/dev/mmcblk0p2 rw\0" \
 	"mmcrootfstype=ext3 rootwait\0" \
 	"nandroot=/dev/mtdblock4 rw\0" \
-@@ -204,10 +206,10 @@
+@@ -214,10 +216,10 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
@@ -42,7 +41,7 @@ index f2d0f53..74d4159 100644
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
 		"bootm ${loadaddr}\0" \
-@@ -217,7 +219,7 @@
+@@ -227,7 +229,7 @@
 		"bootm ${loadaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
@@ -52,5 +51,5 @@ index f2d0f53..74d4159 100644
 			"run bootscript; " \
 		"else " \
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From 157b125b905b6dc69164d3f43eeb5e40d3744648 Mon Sep 17 00:00:00 2001
+From bb88a9c0ffa5b6006d689635028177be4ce83104 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Thu, 20 May 2010 06:14:01 -0500
-Subject: [PATCH] BeagleBoard: Added LED driver
+Subject: [PATCH 42/51] BeagleBoard: Added LED driver

 Added LED driver using status_led.  USR0 is set to monitor the boot
 status.  USR1 is set to be the green LED.
@@ -33,7 +33,7 @@ index f797112..4cc675c 100644
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
 diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
-index 556e995..d21b9c8 100644
+index cdba3dd..a6a4961 100644
 --- a/board/ti/beagle/beagle.c
 +++ b/board/ti/beagle/beagle.c
@@ -30,6 +30,9 @@
@@ -57,7 +57,7 @@ index 556e995..d21b9c8 100644
 	return 0;
 }
 
-@@ -278,3 +285,4 @@ void set_muxconf_regs(void)
+@@ -282,3 +289,4 @@ void set_muxconf_regs(void)
 {
 	MUX_BEAGLE();
 }
@@ -160,5 +160,5 @@ index 0000000..df26552
 +}
 +
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From 609524ecd54526b3f3c7d52cc43a3c9795970f6b Mon Sep 17 00:00:00 2001
+From 1fc5c28bc260c72b4f9cefdf55bfd10504916457 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Thu, 20 May 2010 05:41:26 -0500
-Subject: [PATCH] Add 'led' command
+Subject: [PATCH 43/51] Add 'led' command

 This patch allows any board implementing the coloured LED API
 to control the LEDs from the console.
@@ -252,5 +252,5 @@ index 0000000..3b7b534
 +);
 +
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From 9d3e56ba351348b6329c488a981d3e2d8f848164 Mon Sep 17 00:00:00 2001
+From 40049e97a5a97d597f8754ff1b39d931053eb465 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Wed, 19 May 2010 05:14:43 -0500
-Subject: [PATCH] BeagleBoard: Enabled LEDs
+Subject: [PATCH 44/51] BeagleBoard: Enabled LEDs

 Added LED driver using status_led.  USR0 is set to monitor the boot
 status.  USR1 is set to be the GREEN LED.
@@ -12,7 +12,7 @@ Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
 1 files changed, 13 insertions(+), 0 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index c2fc6ba..eaa8779 100644
+index e4c88f2..053f5df 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
@@ -98,6 +98,18 @@
@@ -34,7 +34,7 @@ index c2fc6ba..eaa8779 100644
 /* DDR - I use Micron DDR */
 #define CONFIG_OMAP3_MICRON_DDR		1
 
-@@ -132,6 +144,7 @@
+@@ -138,6 +150,7 @@
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
@@ -43,5 +43,5 @@ index c2fc6ba..eaa8779 100644
 
 #undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From c053723cc5a73781a4954e6c93d280436623e3d6 Mon Sep 17 00:00:00 2001
+From f5146ac9d3af9c9cd4f4bc940c343d3ef75ac6f0 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Wed, 21 Jul 2010 07:41:25 -0500
-Subject: [PATCH] BeagleBoard: Added userbutton command
+Subject: [PATCH 45/51] BeagleBoard: Added userbutton command

 Based on commit f1099c7c43caf5bac3bf6a65aa266fade4747072
    Author: Greg Turner <gregturner@ti.com>
@@ -93,5 +93,5 @@ index a6a4961..66df719 100644
 +);
 +
 -- 
-1.6.1
+1.6.6.1

@@ -1,7 +1,7 @@
-From d912a6d2d546faf55d07e91816b47096879137cc Mon Sep 17 00:00:00 2001
+From 631cd4e4a02faa5726c058626390bee97188f456 Mon Sep 17 00:00:00 2001
 From: Steven Kipisz <s-kipisz2@ti.com>
 Date: Fri, 4 Jun 2010 10:31:04 -0500
-Subject: [PATCH] BeagleBoard: Add CONFIG_SYS_MEMTEST_SCRATCH
+Subject: [PATCH 46/51] BeagleBoard: Add CONFIG_SYS_MEMTEST_SCRATCH

 Add CONFIG_SYS_MEMTEST_SCRATCH to point to a scratch memory area.

@@ -11,10 +11,10 @@ Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
 1 files changed, 5 insertions(+), 4 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 555b350..0c6fce6 100644
+index 053f5df..b265b0c 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -297,10 +297,11 @@
+@@ -269,10 +269,11 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
 
@@ -31,5 +31,5 @@ index 555b350..0c6fce6 100644
 #define CONFIG_SYS_LOAD_ADDR		(OMAP34XX_SDRC_CS0)	/* default */
 							/* load address */
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From c8d52ff17d71be0c632f20092d96e9530088c786 Mon Sep 17 00:00:00 2001
+From d3f9ba7264111551ea11f33aadbecc15c87a4332 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Wed, 21 Jul 2010 08:47:59 -0500
-Subject: [PATCH] BeagleBoard: Adjust boot command on USER button
+Subject: [PATCH 47/51] BeagleBoard: Adjust boot command on USER button

 When the USER button is pressed, the default boot command will attempt
 to load user.scr.  If that fails, it will try to load a ramdisk image.
@@ -14,10 +14,10 @@ attempts to load the user.scr file.
 1 files changed, 44 insertions(+), 7 deletions(-)

 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index f372de2..6d1166f 100644
+index b265b0c..1a76004 100644
 --- a/include/configs/omap3_beagle.h
 +++ b/include/configs/omap3_beagle.h
-@@ -195,9 +195,12 @@
+@@ -200,9 +200,12 @@
 #define CONFIG_BOOTDELAY		3
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -31,7 +31,7 @@ index f372de2..6d1166f 100644
 	"mpurate=500\0" \
 	"buddy=none\0" \
 	"vram=12M\0" \
-@@ -208,7 +211,10 @@
+@@ -213,7 +216,10 @@
 	"mmcrootfstype=ext3 rootwait\0" \
 	"nandroot=/dev/mtdblock4 rw\0" \
 	"nandrootfstype=jffs2\0" \
@@ -42,7 +42,7 @@ index f372de2..6d1166f 100644
 		"mpurate=${mpurate} " \
 		"buddy=${buddy} "\
 		"vram=${vram} " \
-@@ -217,6 +223,7 @@
+@@ -222,6 +228,7 @@
 		"root=${mmcroot} " \
 		"rootfstype=${mmcrootfstype}\0" \
 	"nandargs=setenv bootargs console=${console} " \
@@ -50,7 +50,7 @@ index f372de2..6d1166f 100644
 		"mpurate=${mpurate} " \
 		"buddy=${buddy} "\
 		"vram=${vram} " \
-@@ -224,7 +231,18 @@
+@@ -229,7 +236,18 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
@@ -70,7 +70,7 @@ index f372de2..6d1166f 100644
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source ${loadaddr}\0" \
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-@@ -235,15 +253,34 @@
+@@ -240,15 +258,34 @@
 		"run nandargs; " \
 		"nand read ${loadaddr} 280000 400000; " \
 		"bootm ${loadaddr}\0" \
@@ -111,5 +111,5 @@ index f372de2..6d1166f 100644
 		"fi; " \
 	"else run nandboot; fi"
 -- 
-1.6.1
+1.6.6.1

@@ -1,7 +1,7 @@
-From bf4b655c6c02bbf95bd6ebbf820e53dbd8eb4803 Mon Sep 17 00:00:00 2001
+From 35e971eea9c9d9cb690da0509e0f8a48a2cb1269 Mon Sep 17 00:00:00 2001
 From: Steve Kipisz <s-kipisz2@ti.com>
 Date: Thu, 5 Aug 2010 10:36:07 -0500
-Subject: [PATCH] BeagleBoard: Enable pullups on i2c2.
+Subject: [PATCH 48/51] BeagleBoard: Enable pullups on i2c2.

 ---
 board/ti/beagle/beagle.c           |    2 ++
@@ -9,10 +9,10 @@ Subject: [PATCH] BeagleBoard: Enable pullups on i2c2.
 2 files changed, 11 insertions(+), 0 deletions(-)

 diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
-index cdba3dd..eeb37bc 100644
+index 66df719..ee6bad2 100644
 --- a/board/ti/beagle/beagle.c
 +++ b/board/ti/beagle/beagle.c
-@@ -163,6 +163,8 @@ int misc_init_r(void)
+@@ -171,6 +171,8 @@ int misc_init_r(void)
 	struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
 	struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
 
@@ -1,8 +1,7 @@
-From 519ecc8a8f441d30e55c7e4552c63e2363fa6dd5 Mon Sep 17 00:00:00 2001
+From 0a49d60caf30738f13b60a71e740e28f4e7af902 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Thu, 5 Aug 2010 13:54:12 -0500
-Subject: [PATCH] BeagleBoard: Add camera to default bootargs
-
+Subject: [PATCH 49/51] BeagleBoard: Add camera to default bootargs

 Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
 ---
@@ -46,5 +45,5 @@ index 1a76004..48ad805 100644
 		"omapfb.mode=dvi:${dvimode} " \
 		"omapdss.def_disp=${defaultdisplay} " \
 -- 
-1.5.6.4
+1.6.6.1

@@ -1,7 +1,7 @@
-From c8d02f2a8500f06de39681aed60ea5c9894f8087 Mon Sep 17 00:00:00 2001
+From 21738fa5ae05dd5060cf755ac0460f5d1f27e910 Mon Sep 17 00:00:00 2001
 From: Jason Kridner <jkridner@beagleboard.org>
 Date: Wed, 11 Aug 2010 14:50:38 -0500
-Subject: [PATCH] BeagleBoard: move ramdisk parameters
+Subject: [PATCH 50/51] BeagleBoard: move ramdisk parameters

 This will make it easier to reprogram the ramdisk size.

@@ -34,5 +34,5 @@ index 48ad805..4f5c1d4 100644
 	"loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 -- 
-1.5.6.4
+1.6.6.1

@@ -0,0 +1,74 @@
+From 05c4ef3b0963cef095075486820b030226ced7c3 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 8 Feb 2011 12:02:46 +0100
+Subject: [PATCH 51/51] add support for beagleboardtoys expansionboards
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ board/ti/beagle/beagle.c |   15 +++++++++++++++
+ board/ti/beagle/beagle.h |   10 ++++++++++
+ 2 files changed, 25 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index ee6bad2..fdd9c09 100644
+--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
+@@ -62,12 +62,16 @@ static struct {
+ #define HYR_VENDORID			0x0400
+ #define MENTOREL_VENDORID		0x0500
+ #define KBADC_VENDORID			0x0600
+#define BBTOYS_VENDORID			0x0B00
+ 
+ #define TINCANTOOLS_ZIPPY		0x01000100
+ #define TINCANTOOLS_ZIPPY2		0x02000100
+ #define TINCANTOOLS_TRAINER		0x04000100
+ #define TINCANTOOLS_SHOWDOG		0x03000100
+ #define KBADC_BEAGLEFPGA		0x01000600
+#define BBTOYS_WIFI				0x01000B00
+#define BBTOYS_VGA				0x02000B00
+#define BBTOYS_LCD				0x03000B00
+ 
+ #define BEAGLE_NO_EEPROM		0xffffffff
+ 
+@@ -209,6 +213,17 @@ int misc_init_r(void)
+ 			MUX_KBADC_BEAGLEFPGA();
+ 			setenv("buddy", "beaglefpga");
+ 			break;
+		case BBTOYS_WIFI:
+			printf("Recognized Beagleboardtoys wifi board\n");
+			MUX_BBTOYS_WIFI()
+			setenv("buddy", "bbtoys-wifi");		
+			break;;
+		case BBTOYS_VGA:
+			printf("Recognized Beagleboardtoys VGA board\n");
+			break;;
+		case BBTOYS_LCD:
+			printf("Recognized Beagleboardtoys LCD board\n");
+			break;;	
+ 		case BEAGLE_NO_EEPROM:
+ 			printf("No EEPROM on expansion board\n");
+ 			setenv("buddy", "none");
+diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
+index cb7fd1c..2dc6ee6 100644
+--- a/board/ti/beagle/beagle.h
+++ b/board/ti/beagle/beagle.h
+@@ -459,6 +459,16 @@ const omap3_sysinfo sysinfo = {
+ 	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTU | EN  | M1)) /*MCSPI4_SOMI*/\
+ 	MUX_VAL(CP(MCBSP1_FSX),     (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/\
+ 
+#define MUX_BBTOYS_WIFI() \
+	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
+	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
+	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
+	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
+	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
+	MUX_VAL(CP(MMC2_DAT3),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
+	MUX_VAL(CP(MMC2_DAT5),      (IEN  | PTU | EN  | M4)) /*GPIO_137*/\
+	MUX_VAL(CP(MMC2_DAT7),      (IDIS | PTD | DIS | M4)) /*GPIO_139*/\
+
+ /*
+  * Display Configuration
+  */
+-- 
+1.6.6.1
+
@@ -1,10 +1,10 @@
 require u-boot.inc
-PR ="r65"
+PR ="r66"

 FILESPATHPKG =. "u-boot-git:"

 SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
-                       file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch \
+                       file://0001-Enable-I2C-bus-switching.patch \
                       file://0002-OMAP3-add-board-revision-detection-for-Overo.patch \
                       file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch \
                       file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch \
@@ -43,17 +43,18 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
                       file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \
                       file://0038-Added-configurations-for-xM-Rev-A-board.patch \
                       file://0039-OMAP3-beagle-setenv-beaglerev-for-AxBx-Cx-xMA-for-be.patch \
-                       file://0001-OMAP-mmc-add-support-for-second-and-third-mmc-chan.patch \
-                       file://0001-OMAP3-Beagle-enable-support-for-second-and-third-m.patch \
-                       file://0038-BeagleBoard-Added-LED-driver.patch \
-                       file://0039-Add-led-command.patch \
-                       file://0041-BeagleBoard-Enabled-LEDs.patch \
-                       file://0042-BeagleBoard-New-command-for-status-of-USER-button.patch \
-                       file://0043-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch \
-                       file://0044-Beagleboard-Adjust-boot.patch \
-                       file://0045-BeagleBoard-Enable-pullups-on-i2c2.patch \
-                       file://0046-BeagleBoard-Add-camera-to-default-bootargs.patch \
-                       file://0001-BeagleBoard-move-ramdisk-parameters.patch \
+                       file://0040-OMAP-mmc-add-support-for-second-and-third-mmc-channe.patch \
+                       file://0041-OMAP3-Beagle-enable-support-for-second-and-third-mmc.patch \
+                       file://0042-BeagleBoard-Added-LED-driver.patch \
+                       file://0043-Add-led-command.patch \
+                       file://0044-BeagleBoard-Enabled-LEDs.patch \
+                       file://0045-BeagleBoard-Added-userbutton-command.patch \
+                       file://0046-BeagleBoard-Add-CONFIG_SYS_MEMTEST_SCRATCH.patch \
+                       file://0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch \
+                       file://0048-BeagleBoard-Enable-pullups-on-i2c2.patch \
+                       file://0049-BeagleBoard-Add-camera-to-default-bootargs.patch \
+                       file://0050-BeagleBoard-move-ramdisk-parameters.patch \
+                       file://0051-add-support-for-beagleboardtoys-expansionboards.patch \
                       file://fw_env.config \
 "
 SRCREV_pn-${PN}_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"