Minor code cleanup. Update CHANGELOG.

diff --git a/CHANGELOG b/CHANGELOG
index e2be1cb8381cf3fb63de0fd20ca8d2553fe75177..441fe16c2a81bf8328a6c071facdc6d5c06d14c2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,37 @@
+commit 78d620ebb5871d252270dedfad60c6568993b780
+Author: Wolfgang Denk <wd@atlas.denx.de>
+Date:  Thu Nov 23 22:58:58 2006 +0100
+
+    Updates for TQM5200 modules:
+    - fix off-by-one error in board/tqm5200/cam5200_flash.c error message
+    - simplify "udate" definitions
+
+commit 2053283304eeddf250d109e6791eb6fa4cad14f7
+Author: Stefan Roese <sr@denx.de>
+Date:  Wed Nov 22 13:20:50 2006 +0100
+
+    [PATCH] PPC4xx start.S: Fix for processor errata
+
+    Fixed cpu/ppc4xx/start.S for 440EPx Errata: further corrects PPC440EPx
+    errata 1.12: 440_33 by moving patch up in code.
+
+    Signed-off-by: Jeff Mann <mannj@embeddedplanet.com>
+    Signed-off-by: Stefan Roese <sr@denx.de>
+
+commit 4ef6251403f637841000e0fef9e832aa01339822
+Author: Stefan Roese <sr@denx.de>
+Date:  Mon Nov 20 20:39:52 2006 +0100
+
+    [PATCH] Update AMCC Sequoia config file to support 64MByte NOR FLASH
+
+    Signed-off-by: Stefan Roese <sr@denx.de>
+
+commit e4bbd8da164b976d38616bd9c69c5e86e193cdf0
+Author: Wolfgang Denk <wd@pollux.denx.de>
+Date:  Mon Nov 20 10:28:30 2006 +0100
+
+    Update CHANGELOG
+
 commit 260421a21e934a68d31fb6125b0fbd2631a8ca20
 Author: Stefan Roese <sr@denx.de>
 Date:  Mon Nov 13 13:55:24 2006 +0100

diff --git a/README b/README
index b78ea6124dc8c4f92e6e4b5746157fe3bffdaea6..f78bf5052333454b7e8368d3663bfd4a6f173cdf 100644 (file)
--- a/README
+++ b/README
@@ -1470,8 +1470,8 @@ The following options need to be configured:
 
                Enable auto completion of commands using TAB.
 
-                Note that this feature has NOT been implemented yet
-                for the "hush" shell.
+               Note that this feature has NOT been implemented yet
+               for the "hush" shell.
 
 
                CFG_HUSH_PARSER
@@ -3114,11 +3114,11 @@ loadaddr=200000
 oftaddr=0x300000
 => bootm $loadaddr - $oftaddr
 ## Booting image at 00200000 ...
-   Image Name:   Linux-2.6.17-dirty
-   Image Type:   PowerPC Linux Kernel Image (gzip compressed)
-   Data Size:    1029343 Bytes = 1005.2 kB
+   Image Name:  Linux-2.6.17-dirty
+   Image Type:  PowerPC Linux Kernel Image (gzip compressed)
+   Data Size:   1029343 Bytes = 1005.2 kB
    Load Address: 00000000
-   Entry Point:  00000000
+   Entry Point:         00000000
    Verifying Checksum ... OK
    Uncompressing Kernel Image ... OK
 Booting using flat device tree at 0x300000

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 8b475c690d9d24affb9d3e33930720a130482f23..5d74bdeb42e2c4e694f031430e8a6846d59cc013 100644 (file)
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -205,8 +205,7 @@ long int initdram (int board_type)
         */
        svr = get_svr();
        pvr = get_pvr();
-       if ((SVR_MJREV(svr) >= 2) && (PVR_MAJ(pvr) == 1) && 
-           (PVR_MIN(pvr) == 4)) {
+       if ((SVR_MJREV(svr) >= 2) && (PVR_MAJ(pvr) == 1) && (PVR_MIN(pvr) == 4)) {
                *(vu_long *)MPC5XXX_SDRAM_SDELAY = 0x04;
                __asm__ volatile ("sync");
        }