boot through u-boot faster

2 files changed, 57 insertions, 6 deletions

diff --git a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
index 8e2b658634..97dc2f193d 100644
--- a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
+++ b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
@@ -1851,8 +1851,57 @@ diff -uprN u-boot-1.3.4-vanilla/doc/README.at91 u-boot-1.3.4/doc/README.at91
 +	  	make at91sam9263ek_dataflash_cs0_config	- use data flash (spi cs0)
 diff -uprN u-boot-1.3.4-vanilla/drivers/net/macb.c u-boot-1.3.4/drivers/net/macb.c
 --- u-boot-1.3.4-vanilla/drivers/net/macb.c	2008-08-12 09:08:38.000000000 -0500
-+++ u-boot-1.3.4/drivers/net/macb.c	2010-03-25 16:45:59.000000000 -0500
-@@ -414,18 +414,16 @@ static int macb_init(struct eth_device *
++++ u-boot-1.3.4/drivers/net/macb.c	2010-05-04 14:32:15.000000000 -0500
+@@ -55,7 +55,7 @@
+ #define CFG_MACB_RX_RING_SIZE		(CFG_MACB_RX_BUFFER_SIZE / 128)
+ #define CFG_MACB_TX_RING_SIZE		16
+ #define CFG_MACB_TX_TIMEOUT		1000
+-#define CFG_MACB_AUTONEG_TIMEOUT	5000000
++#define CFG_MACB_AUTONEG_TIMEOUT	3000000
+ 
+ struct macb_dma_desc {
+ 	u32	addr;
+@@ -290,11 +290,12 @@ static int macb_recv(struct eth_device *
+ 	return 0;
+ }
+ 
+-static void macb_phy_reset(struct macb_device *macb)
++static u16 macb_phy_reset(struct macb_device *macb)
+ {
+ 	struct eth_device *netdev = &macb->netdev;
+ 	int i;
+-	u16 status, adv;
++	u16 status = 0;
++	u16 adv;
+ 
+ 	adv = ADVERTISE_CSMA | ADVERTISE_ALL;
+ 	macb_mdio_write(macb, MII_ADVERTISE, adv);
+@@ -314,6 +315,8 @@ static void macb_phy_reset(struct macb_d
+ 	else
+ 		printf("%s: Autonegotiation timed out (status=0x%04x)\n",
+ 		       netdev->name, status);
++
++	return status;
+ }
+ 
+ static int macb_phy_init(struct macb_device *macb)
+@@ -334,14 +337,7 @@ static int macb_phy_init(struct macb_dev
+ 	status = macb_mdio_read(macb, MII_BMSR);
+ 	if (!(status & BMSR_LSTATUS)) {
+ 		/* Try to re-negotiate if we don't have link already. */
+-		macb_phy_reset(macb);
+-
+-		for (i = 0; i < CFG_MACB_AUTONEG_TIMEOUT / 100; i++) {
+-			status = macb_mdio_read(macb, MII_BMSR);
+-			if (status & BMSR_LSTATUS)
+-				break;
+-			udelay(100);
+-		}
++		status = macb_phy_reset(macb);
+ 	}
+ 
+ 	if (!(status & BMSR_LSTATUS)) {
+@@ -414,18 +410,16 @@ static int macb_init(struct eth_device *
  
  	/* choose RMII or MII mode. This depends on the board */
  #ifdef CONFIG_RMII
@@ -2591,8 +2640,8 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9g10ek.h u-boot-1.3.4/inc
 +#endif
 diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9g20ek.h u-boot-1.3.4/include/configs/at91sam9g20ek.h
 --- u-boot-1.3.4-vanilla/include/configs/at91sam9g20ek.h	1969-12-31 17:00:00.000000000 -0700
-+++ u-boot-1.3.4/include/configs/at91sam9g20ek.h	2010-03-25 18:16:41.000000000 -0500
-@@ -0,0 +1,210 @@
++++ u-boot-1.3.4/include/configs/at91sam9g20ek.h	2010-05-04 13:55:32.000000000 -0500
+@@ -0,0 +1,212 @@
 +/*
 + * (C) Copyright 2007-2008
 + * Stelian Pop <stelian.pop@leadtechdesign.com>
@@ -2649,7 +2698,7 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9g20ek.h u-boot-1.3.4/inc
 +#undef CONFIG_USART2
 +#define CONFIG_USART3		1	/* USART 3 is DBGU */
 +
-+#define CONFIG_BOOTDELAY	3
++#define CONFIG_BOOTDELAY	1
 +
 +/*
 + * BOOTP options
@@ -2802,6 +2851,8 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9g20ek.h u-boot-1.3.4/inc
 +	"kernel_addr=0x000A0000\0"			\
 +	""
 +
++#define CONFIG_ZERO_BOOTDELAY_CHECK		1
++
 +#endif
 diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9m10g45ek.h u-boot-1.3.4/include/configs/at91sam9m10g45ek.h
 --- u-boot-1.3.4-vanilla/include/configs/at91sam9m10g45ek.h	1969-12-31 17:00:00.000000000 -0700
diff --git a/recipes/u-boot/u-boot_1.3.4.bb b/recipes/u-boot/u-boot_1.3.4.bb
index 497654dc77..4b6a20d1ba 100644
--- a/recipes/u-boot/u-boot_1.3.4.bb
+++ b/recipes/u-boot/u-boot_1.3.4.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-PR = "r5"
+PR = "r6"
 ALLOW_EMPTY = 1
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"