From: Wolfgang Denk <wd@pollux.denx.de>
Date: Tue, 9 May 2006 11:32:33 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: LABEL_2006_05_19_1133~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=67a94685225b289fb3344cf00fefa91fd93f24ae;p=oweals%2Fu-boot.git

Merge with /home/wd/git/u-boot/master
---

67a94685225b289fb3344cf00fefa91fd93f24ae
diff --cc CHANGELOG
index a491ec060e,ef3b807f14..ad5f7a32e9
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,12 +2,14 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 +* Fix lowboot support on MCC200 board
 +
+ * 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