Merge branch 'ft_infr'

diff --cc CHANGELOG
index 1aa8f31e759fcb08027d270d553b97e365b87653,1ad9bd36ce45e3a553eda1fab97e7e206093f73c..e1d1ac65d5b29795edda68aa63c324448025bde0
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,32 -2,34 +2,60 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Add helper function for generic flat device tree fixups for mpc83xx
+   Patch by Kumar Gala 11 Jan 2006
+ 
+ * Add support for passing initrd information via flat device tree
+   Patch by Kumar Gala 11 Jan 2006
+ 
+ * Added OF_STDOUT_PATH and OF_SOC
+ 
+   OF_STDOUT_PATH specifies the path to the device the kernel can use
+   for console output
+ 
+   OF_SOC specifies the proper name of the SOC node if one exists.
+   Patch by Kumar Gala 11 Jan 2006
+ 
+ * Allow board code to fixup the flat device tree before booting a
+   kernel
+   Patch by Kumar Gala 11 Jan 2006
+ 
+ * Added CONFIG_ options for bd_t and env in flat dev tree
+ 
+       CONFIG_OF_HAS_BD_T will put a copy of the bd_t
+       into the resulting flat device tree.
+ 
+       CONFIG_OF_HAS_UBOOT_ENV will copy the environment
+       variables from u-boot into the flat device tree
+ 
+   Patch by Kumar Gala 11 Jan 2006
+ 
 +* Report back PCI bus when doing table based device config
 +  Patch by Kumar Gala 11 Jan 2006
 +
 +* Added support for PCI prefetchable region and BARs
 +  If a host controller sets up a region as prefetchable and
 +  a device's BAR denotes it as prefetchable, allocate the
 +  BAR into the prefetch region.
 +
 +  If a BAR is prefetchable and no prefetchable region has
 +  been setup by the controller we fall back to allocating
 +  the BAR into the normally memory region.
 +  Patch by Kumar Gala 11 Jan 2006
 +
 +* Only disable the MPC83xx watchdog if its enabled out of reset.
 +  If its disabled out of reset SW can later enable it if so desired
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Allow config of GPIO direction & data registers at boot on 83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Enable time handling on 83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Make System IO Config Registers board configurable on MPC83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
  * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
  
  * Fix compiler problem with at91rm9200dk board.