rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 872765c..6e72e96 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -68,7 +68,8 @@
 #ifdef DEPLOYMENT
 #define CONFIG_BOOT_RETRY_TIME         -1
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT         "autoboot in %d seconds (stop with 'st')...\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "autoboot in %d seconds (stop with 'st')...\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR       "st"
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY          1
@@ -228,14 +229,14 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms)      */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
-#define CFG_ENV_ADDR           0xFA000100
-#define CFG_ENV_SIZE           0x1000
+#ifdef CONFIG_ENV_IS_IN_NVRAM
+#define CONFIG_ENV_ADDR                0xFA000100
+#define CONFIG_ENV_SIZE                0x1000
 #else
-#define CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_OFFSET         0x30000 /* Offset of Environment Sector         */
-#define CFG_ENV_SIZE           0x8000  /* Total Size of Environment Sector     */
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_OFFSET              0x30000 /* Offset of Environment Sector         */
+#define CONFIG_ENV_SIZE                0x8000  /* Total Size of Environment Sector     */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 #define CFG_RESET_ADDRESS      ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))