rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index ab13d2e..5426c7a 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -83,7 +83,7 @@
 #define CONFIG_AUTOBOOT                        1
 #define CONFIG_AUTOBOOT_KEYED          1
 #define CONFIG_AUTOBOOT_PROMPT                         \
-       "Press SPACE to abort autoboot in %d seconds\n"
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "d"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 
@@ -129,7 +129,7 @@
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 
 #define CFG_FLASH_BASE                 0x00000000
 #define CFG_FLASH_SIZE                 0x800000
@@ -143,9 +143,9 @@
 
 #define CFG_SDRAM_BASE                 0x10000000
 
-#define CFG_ENV_IS_IN_FLASH            1
-#define CFG_ENV_SIZE                   65536
-#define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
+#define CONFIG_ENV_IS_IN_FLASH         1
+#define CONFIG_ENV_SIZE                        65536
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFIG_ENV_SIZE)
 
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)