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 0b09482..3e64a7e 100644 (file)
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -65,9 +65,10 @@
 #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
@@ -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