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

diff --combined README
index 40ce961,5dfc9fe..62cdfd0
--- 1/README
--- 2/README
+++ b/README
@@@ -350,7 -350,7 +350,7 @@@ The following options need to be config
                expect it to be in bytes, others in MB.
                Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes.
  
-               CONFIG_OF_LIBFDT / CONFIG_OF_FLAT_TREE
+               CONFIG_OF_LIBFDT
  
                New kernel versions are expecting firmware settings to be
                passed using flattened device trees (based on open firmware
@@@ -361,13 -361,6 +361,6 @@@
                 * Adds the "fdt" command
                 * The bootm command automatically updates the fdt
  
-               CONFIG_OF_FLAT_TREE
-                * Deprecated, see CONFIG_OF_LIBFDT
-                * Original ft_build.c-based support
-                * Automatically modifies the dft as part of the bootm command
-                * The environment variable "disable_of", when set,
-                    disables this functionality.
- 
                OF_CPU - The proper name of the cpus node.
                OF_SOC - The proper name of the soc node.
                OF_TBCLK - The timebase frequency.
@@@ -786,21 -779,6 +779,21 @@@
                        Define this to use i/o functions instead of macros
                        (some hardware wont work with macros)
  
 +              CONFIG_DRIVER_SMC911X
 +              Support for SMSC's LAN911x and LAN921x chips
 +
 +                      CONFIG_DRIVER_SMC911X_BASE
 +                      Define this to hold the physical address
 +                      of the device (I/O space)
 +
 +                      CONFIG_DRIVER_SMC911X_32_BIT
 +                      Define this if data bus is 32 bits
 +
 +                      CONFIG_DRIVER_SMC911X_16_BIT
 +                      Define this if data bus is 16 bits. If your processor
 +                      automatically converts one 32 bit word to two 16 bit
 +                      words you may also try CONFIG_DRIVER_SMC911X_32_BIT.
 +
  - USB Support:
                At the moment only the UHCI host controller is
                supported (PIP405, MIP405, MPC5200); define

diff --combined board/tqc/tqm8272/tqm8272.c
index 7bd6401,ec1a37c..ec1a37c
--- 1/board/tqc/tqm8272/tqm8272.c
--- 2/board/tqm8272/tqm8272.c
+++ b/board/tqc/tqm8272/tqm8272.c
@@@ -30,10 -30,6 +30,6 @@@
  #include <pci.h>
  #include <asm/m8260_pci.h>
  #endif
- #if CONFIG_OF_FLAT_TREE
- #include <ft_build.h>
- #include <image.h>
- #endif
  
  #if 0
  #define deb_printf(fmt,arg...) \