Merge with /home/sr/git/u-boot/denx

diff --git a/CHANGELOG b/CHANGELOG
index f09be8a1c161955a017726b25e694928b7b1f481..02ccd30a3e704e0b8298770fe65d376b47faca51 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@ Changes since U-Boot 1.1.4:
   of total memory and u-boot will not booting up.
   Patch by Adam Graham, 24 Aug 2006
 
+* Fix typo.
+
 * Code cleanup
 
 * Update for MCC200 / PRS200 boards:

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 14a5bae36c7c1ab6b543517a014104858dee846a..fc5781e438fbb9c529f7f828d6807cfd5fe96f46 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -143,7 +143,7 @@
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "net_nfs=tftp 200000 ${bootfile};"                              \
                "run nfsargs addip addcons;bootm\0"                     \
-       "console=" LINUX_CONSOLE "\0"                           \
+       "console=" CFG__LINUX_CONSOLE "\0"                              \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/" CFG__BOARDNAME "/uImage\0"                \
        "load=tftp 200000 /tftpboot/" CFG__BOARDNAME "/u-boot.bin\0"    \