rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

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

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 6b585be..53228c1 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -152,8 +152,9 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 
 /* Only interrupt boot if special string is typed */
-#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n"
+#define CONFIG_AUTOBOOT_KEYED  1
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Autobooting in %d seconds\n", bootdelay
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #undef  CONFIG_AUTOBOOT_STOP_STR        /* defined via environment var  */
 #define CONFIG_AUTOBOOT_STOP_STR2 "esdesd" /* esd special for esd access*/
@@ -253,14 +254,14 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM    1       /* use NVRAM for environment vars       */
+#define CONFIG_ENV_IS_IN_NVRAM 1       /* use NVRAM for environment vars       */
 #define CFG_ENV_SIZE           0x0ff8          /* Size of Environment vars     */
 #define CFG_ENV_ADDR           \
        (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))   /* Env  */
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET         0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE           0x800   /* 2048 bytes may be used for env vars*/
                                   /* total size of a CAT24WC16 is 2048 bytes */