Merge branch 'master' of /home/wd/git/u-boot/custodians

[karo-tx-uboot.git] / include / configs / CU824.h

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 68e816a74436874e7dffea468977be26b611367a..a40df76f3e820677a36cf7a1190af96443e527ea 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -50,7 +50,7 @@
 #define CONFIG_BAUDRATE                9600
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
 
 #define CONFIG_BOOTCOMMAND     "bootm FE020000"        /* autoboot command     */
 #define CONFIG_BOOTDELAY       5
@@ -271,15 +271,15 @@
        /* Warining: environment is not EMBEDDED in the U-Boot code.
         * It's stored in flash separately.
         */
-#define CFG_ENV_IS_IN_FLASH        1
+#define CONFIG_ENV_IS_IN_FLASH     1
 #if 0
-#define CFG_ENV_ADDR           0xFF008000
-#define CFG_ENV_SIZE           0x8000  /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFF008000
+#define CONFIG_ENV_SIZE                0x8000  /* Size of the Environment Sector       */
 #else
-#define CFG_ENV_ADDR           0xFFFC0000
-#define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFFFC0000
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Size of the Environment Sector       */
 #endif
 
 /*-----------------------------------------------------------------------
@@ -305,7 +305,7 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
+#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 #define CONFIG_TULIP_USE_IO