From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 3 May 2006 15:52:20 +0000 (+0200)
Subject: Merge with git://git.kernel.org/pub/scm/boot/u-boot/galak/u-boot.git#mpc8349emds
X-Git-Tag: LABEL_2006_05_19_1133~16^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69;p=karo-tx-uboot.git

Merge with git://git.kernel.org/pub/scm/boot/u-boot/galak/u-boot.git#mpc8349emds
---

0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69
diff --cc CHANGELOG
index c774dd0525,f8bba74487..ef3b807f14
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,26 -2,12 +2,32 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Merged MPC8349ADS and MPC8349EMDS ports into MPC8349EMDS port:
+   - Removed MPC8349ADS port
+   - Added PCI support to MPC8349ADS
+   - reworked memory map to allow mapping of all regions with BATs
+   Patch by Kumar Gala 20 Apr 2006
+ 
 +* Coding Style cleanup
 +
 +* Write RTC seconds first to maintain settings integrity per
 +  Maxim/Dallas DS1306 data sheet.
 +  Patch by Alan J. Luse, 02 May 2006
 +
 +* Scheduled for removal: strnicmp() which is unused
 +
 +* Update for Intel Monahans boards:
 +  - support for magic key detection and handling on delta board
 +  - NAND support for zylonite board + some minor cleanup
 +
 +* Declare load_serial_ymodem() when using CFG_CMD_LOADB.
 +  Patch by Jon Loeliger, 01 May 2006
 +
 +* Fixed handling of bad checksums with "mkimage -l"
 +
 +* Added support for BC3450 board
 +  Patch by Stefan Strobl, 21 Oct 2005
 +
  * Update for NC650 board:
    - Support rev1 and rev2 hardware
    - adapt to new NAND layer