From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 12 Jan 2006 21:52:02 +0000 (-0600)
Subject: Merge branch 'mpc8349ads'
X-Git-Tag: LABEL_2006_05_19_1133~16^2^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e;p=u-boot

Merge branch 'mpc8349ads'
---

06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e
diff --cc CHANGELOG
index 28133baabf,6c66441708..2d6ce103d9
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,65 -2,6 +2,66 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
++<<<<<<< HEAD/CHANGELOG
 +* 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
 +
 +* 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
 +
  * Added PCI support for MPC8349ADS board
    Patch by Kumar Gala 11 Jan 2006