u-boot git: update beagleboard patchset

15 files changed, 73 insertions, 13 deletions

diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch
index 10e3412bcd..53fbbb0a15 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch
@@ -1,7 +1,7 @@
 From f62aac5842779fbc5a62ade1c78d47244d565456 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 01/12] beagleboard: display message about I2C errors being expected when no expansion boards are present
+Subject: [PATCH 01/14] beagleboard: display message about I2C errors being expected when no expansion boards are present
 
 ---
  board/ti/beagle/beagle.c |    3 +++
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch
index 6638532f7e..51db46197c 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch
@@ -1,7 +1,7 @@
 From d195df3a41a9614e150f517a25bf7b7f684bf05d 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 02/12] beagleboard: fix TCT expansionboard IDs
+Subject: [PATCH 02/14] beagleboard: fix TCT expansionboard IDs
 
 ---
  board/ti/beagle/beagle.c |    4 ++--
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch
index 024ebaab1f..edb90cc04a 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch
@@ -1,7 +1,7 @@
 From 53c3410ac7acae89c349cd1aa9b51fd81807dfd7 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 03/12] Add DSS driver for OMAP3
+Subject: [PATCH 03/14] Add DSS driver for OMAP3
 
 Supports dynamic panel configuration
 Supports dynamic tv standard selection
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch
index fcb10e9a12..e347a04858 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch
@@ -1,7 +1,7 @@
 From 907184b7135a2f954b905fdae8d1d6fff0d35744 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 04/12] Enable DSS driver for Beagle
+Subject: [PATCH 04/14] Enable DSS driver for Beagle
 
 Configures DSS to display color bar on Svideo
 Configures DSS to display background color on DVID
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
index 1f76c9e5b2..ea85369991 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch
@@ -1,7 +1,7 @@
 From 5a19707fed74b11a448c8467806b1cc038b449bc 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 05/12] beagleboardXM: don't set mpurate on xM in bootargs
+Subject: [PATCH 05/14] beagleboardXM: don't set mpurate on xM in bootargs
 
 ---
  board/ti/beagle/beagle.c |    1 -
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch
index b1d1f40885..7e1e0c9337 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch
@@ -1,7 +1,7 @@
 From 02ed9b6e7ddb60e440de346d56e77b9462f92d52 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 12:08:00 +0100
-Subject: [PATCH 06/12] OMAP3: fix and clean up L2 cache enable/disable functions
+Subject: [PATCH 06/14] 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,
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch
index 5942c2e3b1..2f942c3ec3 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch
@@ -1,7 +1,7 @@
 From 30ae6d713660fb415e6f253ec30cc0b2e5ffc2ee Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 16:49:57 +0100
-Subject: [PATCH 07/12] OMAP3: convert setup_auxcr() to pure asm
+Subject: [PATCH 07/14] 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
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch
index 5c3e02f0f8..03ba6cae02 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch
@@ -1,7 +1,7 @@
 From 2d0c47945ca49aa18dbedd9e4266ec18bc3b0150 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans@mansr.com>
 Date: Wed, 14 Apr 2010 17:10:28 +0100
-Subject: [PATCH 08/12] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions
+Subject: [PATCH 08/14] 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
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch
index 53020a00ab..0ff07da0a3 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch
@@ -1,7 +1,7 @@
 From c5e5d27f80e389ddb8c7107e972b94c8d995dc84 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 09/12] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
+Subject: [PATCH 09/14] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
 
 ---
  board/ti/beagle/beagle.c |    8 ++++++++
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch
index 8b55544e5c..5e4cd3b08e 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch
@@ -1,7 +1,7 @@
 From 3c116f300402f6375b7a8987b17962e125372d9d 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 10/12] OMAP3: beagle: set mpurate to 600 for revB and revC1-3
+Subject: [PATCH 10/14] OMAP3: beagle: set mpurate to 600 for revB and revC1-3
 
 ---
  board/ti/beagle/beagle.c |    2 ++
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch
index 9c412fc41c..04bea2c18c 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch
@@ -1,7 +1,7 @@
 From cd82c1f2db57407bc6571a3221937c14924cc440 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 11/12] OMAP3: beagle: prettify expansionboard message a bit
+Subject: [PATCH 11/14] OMAP3: beagle: prettify expansionboard message a bit
 
 ---
  board/ti/beagle/beagle.c |    2 +-
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch
index b33af9d0a4..e2be708490 100644
--- a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch
+++ b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch
@@ -1,7 +1,7 @@
 From f5796d9de9622ef47fff175613f1baf1d372b5ff 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 12/12] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard
+Subject: [PATCH 12/14] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard
 
 ---
  board/ti/beagle/beagle.c |    2 ++
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch
new file mode 100644
index 0000000000..bd7aa8d6e8
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0013-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch
@@ -0,0 +1,24 @@
+From e1818be98d38ca515f3dd5be9bb6074fe0c6e564 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 13/14] OMAP3: Beagle: set mpurate to 1000 for xM
+
+---
+ board/ti/beagle/beagle.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
+index 39c53f2..9300984 100644
+--- a/board/ti/beagle/beagle.c
++++ b/board/ti/beagle/beagle.c
+@@ -238,6 +238,7 @@ int misc_init_r(void)
+ 					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
+ 					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
+ 					TWL4030_PM_RECEIVER_DEV_GRP_P1);
++		setenv("mpurate", "1000");
+ 		break;
+ 	default:
+ 		printf("Beagle unknown 0x%02x\n", beagle_revision);
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch b/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch
new file mode 100644
index 0000000000..9b19993cf8
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0014-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch
@@ -0,0 +1,34 @@
+From 94ea631bf18a242660a1c3e6e028409480217837 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 14/14] 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
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -178,7 +178,7 @@
+ 							/* partition */
+ 
+ /* Environment information */
+-#define CONFIG_BOOTDELAY		10
++#define CONFIG_BOOTDELAY		3
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
+@@ -186,7 +186,7 @@
+ 	"console=ttyS2,115200n8\0" \
+ 	"mpurate=500\0" \
+ 	"vram=12M\0" \
+-	"dvimode=1024x768MR-16@60\0" \
++	"dvimode=640x480MR-16@60\0" \
+ 	"defaultdisplay=dvi\0" \
+ 	"mmcroot=/dev/mmcblk0p2 rw\0" \
+ 	"mmcrootfstype=ext3 rootwait\0" \
+-- 
+1.6.6.1
+
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 5004ffc507..328feff9a9 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r47"
+PR ="r48"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -31,6 +31,8 @@ SRC_URI_beagleboard = "git://www.sakoman.com/git/u-boot.git;branch=omap3-v2010.3
                        file://0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch;patch=1 \
                        file://0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch;patch=1 \
                        file://0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch;patch=1 \
+                       file://0013-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch;patch=1 \
+                       file://0014-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch;patch=1 \
                        file://fw_env.config \
 "
 SRCREV_beagleboard = "946351081bd14e8bf5816fc38b82e004a0e6b4fe"