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

diff --git a/CHANGELOG b/CHANGELOG
index d2cfb63f9a8a1c5325182434eb6752965325c01d..6b219d898e33ef40ccc724d3908b464563d9dc20 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ Changes since U-Boot 1.1.4:
 * Fix CONFIG_CMDLINE_EDITING implementation
   Patch by Stefan Roese, 27 Jul 2006
 
+* Fix preboot message on TQM5200 after switching to hush parser.
+
 * MCC200: set default configuration to low_boot DDR,
   and support for configurable options high_boot and/or SDRAM.
 

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 717af86b909cc44d919a9bf85edb7ab84ee30552..be83b676720dec596861db004e4b7039a42cf790 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -191,7 +191,7 @@
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS