Merge rsync://rsync.denx.de/git/u-boot

diff --cc CHANGELOG
index 5a1ef9fbd5a07d8571210a2d66107526c65666e2,a4b0700dbcd7bf409be920fbe418e46cceffc4b0..eaa18931b8896ac6c9ce21e649216cc6cf36d064
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,78 -2,59 +2,131 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
- * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
 +* Enable address translation on MPC83xx
 +  Patch by Kumar Gala, 10 Feb 2006
 +
 +* Decopuled setting of OR/BR and LBLAWBAR/LBLAWAR on MPC83xx
 +  Patch by Kumar Gala, 25 Jan 2006
 +
 +* 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
 +
 +* 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
 +
+ * Add basic support for the SMMACO4 Board from PanDaCom.
+   Patch by Heiko Schocher, 20 Feb 2006
+ 
+ * Add GIT version information (commid ID) to untagged U-Boot versions
+ 
+   As done in the linux kernel, the U-Boot version (U_BOOT_VERSION)
+   of all unreleased (untagged) U-Boot images will be automatically
+   extended upon compiletime with a part of the GIT commit ID and
+   possibly with "dirty" if uncommited changes are detected.
+ 
+   Here an example for the resulting version:
+   "U-Boot 1.1.4-g3457ac18-dirty"
+ 
+   The version is now maintained in the toplevel Makefile and the
+   version headers are autogenerated.
+ 
+   Patch by Stefan Roese, 9 Feb 2006
+ 
+ * Update default environment for INKA4x00 board.
+ 
+ * Convert CPCI750 to use common CFI flash driver
+   Patch by Reinhard Arlt, 8 Feb 2006
+ 
+ * Various changes to esd HH405 board specific files
+   Patch by Matthias Fuchs, 07 Feb 2006
+ 
+ * Cleanup U-Boot boot messages on ARM.
+ 
+   To match the U-Boot user interface on ARM platforms to the U-Boot
+   standard (as on PPC platforms), some messages with debug character
+   are removed from the default U-Boot build.
+   Enable DEBUG for lib_arm/board.c to enable debug messages.
+   New CONFIG_DISPLAY_CPUINFO and CONFIG_DISPLAY_BOARDINFO options.
+   Patch  by Stefan Roese, 24 Jan 2006
+ 
+ * Fix various compiler warnings on ppc4xx builds (ELDK 4.0)
+   Patch by Stefan Roese, 18 Jan 2006
+ 
+ * Add VGA support (CT69000) to CPCI750 board.
+   Insert missing __le32_to_cpu() for filesize in ext2fs_read_file().
+   Patch by Reinhard Arlt, 30 Dec 2005
+ 
+ * PMC405 and CPCI405: Moved configuration of pci resources
+   into config file.
+   PMC405 and CPCI2DP: Added firmware download and booting via pci.
+   Patch by Matthias Fuchs, 20 Dec 2005
+ 
+ * Fix 28F256J3A support on PM520 board
+   (without bank-switching only 32 MB can be accessed)
+ 
+ * Fix mkimage bug with multifile images created on 64 bit systems.
+ 
+ * Add support for 28F256J3A flash (=> 64 MB) on PM520 board
++>>>>>>> 6624b687bc2b747233090e67628df37d1c84ed17/CHANGELOG
  
  * Fix compiler problem with at91rm9200dk board.
    Patch by Eugen Bigz, 19 Dec 2005