rename CFG_ENV macros to CONFIG_ENV

[platform/kernel/u-boot.git] / include / configs / NC650.h

diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index c051a35..3e64a7e 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -65,23 +65,24 @@
 #define CFG_MEASURE_CPUCLK
 #define CFG_8XX_XIN                    CONFIG_8xx_OSCLK
 
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
+#define CONFIG_BOOTDELAY               5       /* autoboot after 5 seconds     */
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "\nEnter password - autoboot in %d seconds...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nEnter password - autoboot in %d seconds...\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "ids"
 #define CONFIG_BOOT_RETRY_TIME         900
 #define CONFIG_BOOT_RETRY_MIN          30
 
-#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"
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
-       "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
-       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
+       "bootp;"                                                                \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
-#define CONFIG_WATCHDOG                        /* watchdog enabled             */
+#define CONFIG_WATCHDOG                        /* watchdog enabled             */
 
 #undef CONFIG_STATUS_LED               /* Status LED disabled          */
 
@@ -175,7 +176,7 @@
 #define CFG_MEMTEST_START      0x0100000       /* memtest works on     */
 #define CFG_MEMTEST_END                0x0400000       /* 1 ... 4 MB in DRAM   */
 
-#define CFG_LOAD_ADDR          0x00100000
+#define CFG_LOAD_ADDR          0x00100000
 
 #define        CFG_HZ          1000            /* decrementer freq: 1 ms ticks */
 
@@ -231,11 +232,11 @@
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_OFFSET         0x00740000
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_OFFSET              0x00740000
 
-#define CFG_ENV_SECT_SIZE      0x20000 /* Total Size of Environment sector     */
-#define        CFG_ENV_SIZE            0x4000  /* Used Size of Environment Sector      */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* Total Size of Environment sector     */
+#define        CONFIG_ENV_SIZE         0x4000  /* Used Size of Environment Sector      */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration