Merge branch 'mpc83xx'

diff --cc CHANGELOG
index 28133baabf1b41b30ae2305bda36a54a6979ab12,12856fbb6cc4b3eb62fd7eeea3112b64b2d65f65..1f1586ff64bef72e18c98cf75c8dfaafacaba8b5
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,52 -2,9 +2,55 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fixed defines for MPC83xx SICRL register to match current specs
+   Patch by Kumar Gala, 23 Jan 2006
+ 
 +* Fixed PCI indirect config ops to handle multiple PCI controllers
 +  We need to adjust the bus number we are trying to access based
 +  on which PCI controller its on
 +  Patch by Kumar Gala 12 Jan 2006
 +
 +* 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