Merge branch 'master' of git://www.denx.de/git/u-boot-net

diff --combined README
index 3f3666879137a846c9fb616af281173f555931cb,64127ab9503b23e2b886f323a2b8d6b958ec903a..8a8915dc842c6ed6e28b3be09aa88232a5640a83
--- 1/README
--- 2/README
+++ b/README
@@@ -751,6 -751,9 +751,9 @@@ The following options need to be config
                CONFIG_E1000
                Support for Intel 8254x gigabit chips.
  
+               CONFIG_E1000_FALLBACK_MAC
+               default MAC for empty eeprom after production.
+ 
                CONFIG_EEPRO100
                Support for Intel 82557/82559/82559ER chips.
                Optional CONFIG_EEPRO100_SROM_WRITE enables eeprom
@@@ -1151,6 -1154,20 +1154,20 @@@
                of the "hostname" environment variable is passed as
                option 12 to the DHCP server.
  
+               CONFIG_BOOTP_DHCP_REQUEST_DELAY
+ 
+               A 32bit value in microseconds for a delay between
+               receiving a "DHCP Offer" and sending the "DHCP Request".
+               This fixes a problem with certain DHCP servers that don't
+               respond 100% of the time to a "DHCP request". E.g. On an
+               AT91RM9200 processor running at 180MHz, this delay needed
+               to be *at least* 15,000 usec before a Windows Server 2003
+               DHCP server would reply 100% of the time. I recommend at
+               least 50,000 usec to be safe. The alternative is to hope
+               that one of the retries will be successful but note that
+               the DHCP timeout and retry process takes a longer than
+               this delay.
+ 
   - CDP Options:
                CONFIG_CDP_DEVICE_ID
  
@@@ -1929,27 -1946,6 +1946,27 @@@ Configuration Settings
                Scratch address used by the alternate memory test
                You only need to set this if address zero isn't writeable
  
 +- CFG_MEM_TOP_HIDE (PPC only):
 +              If CFG_MEM_TOP_HIDE is defined in the board config header,
 +              this specified memory area will get subtracted from the top
 +              (end) of ram and won't get "touched" at all by U-Boot. By
 +              fixing up gd->ram_size the Linux kernel should gets passed
 +              the now "corrected" memory size and won't touch it either.
 +              This should work for arch/ppc and arch/powerpc. Only Linux
 +              board ports in arch/powerpc with bootwrapper support that
 +              recalculate the memory size from the SDRAM controller setup
 +              will have to get fixed in Linux additionally.
 +
 +              This option can be used as a workaround for the 440EPx/GRx
 +              CHIP 11 errata where the last 256 bytes in SDRAM shouldn't
 +              be touched.
 +
 +              WARNING: Please make sure that this value is a multiple of
 +              the Linux page size (normally 4k). If this is not the case,
 +              then the end address of the Linux memory will be located at a
 +              non page size aligned address and this could cause major
 +              problems.
 +
  - CFG_TFTP_LOADADDR:
                Default load address for network file downloads
  

diff --combined drivers/net/Makefile
index 948239885c26e61b28826b2bedf65b73e600f0a5,eafd2670075029034ffb9a59e6df792fa8a96b5c..6f0225b586a65bb2e5f5f24dddd94e12ef26723b
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -35,6 -35,7 +35,7 @@@ COBJS-y += e1000.
  COBJS-y += eepro100.o
  COBJS-y += enc28j60.o
  COBJS-y += fsl_mcdmafec.o
+ COBJS-$(CONFIG_GRETH) += greth.o
  COBJS-y += inca-ip_sw.o
  COBJS-y += ks8695eth.o
  COBJS-y += lan91c96.o
@@@ -54,7 -55,6 +55,7 @@@ COBJS-y += rtl8139.
  COBJS-y += rtl8169.o
  COBJS-y += s3c4510b_eth.o
  COBJS-y += smc91111.o
 +COBJS-y += smc911x.o
  COBJS-y += tigon3.o
  COBJS-y += tsec.o
  COBJS-y += tsi108_eth.o