rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index 00e09f7..18bbbc3 100644 (file)
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -62,8 +62,9 @@
 /* Only interrupt boot if space is pressed */
 /* If a long serial cable is connected but */
 /* other end is dead, garbage will be read */
-#define CONFIG_AUTOBOOT_KEYED 1
-#define CONFIG_AUTOBOOT_PROMPT "Press space to abort autoboot in %d second\n"
+#define CONFIG_AUTOBOOT_KEYED  1
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Press space to abort autoboot in %d second\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR "d"
 #define CONFIG_AUTOBOOT_STOP_STR " "
 
@@ -193,12 +194,12 @@
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
 #define CFG_FLASH_WRITE_TOUT   500             /* Timeout for Flash Write (in ms)      */
 
-#define        CFG_ENV_IS_IN_FLASH 1
-#undef CFG_ENV_IS_IN_EEPROM
-#define CFG_ENV_OFFSET         0x000E0000
-#define        CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
+#define        CONFIG_ENV_IS_IN_FLASH 1
+#undef CONFIG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_OFFSET              0x000E0000
+#define        CONFIG_ENV_SIZE         0x4000  /* Total Size of Environment Sector     */
 
-#define CFG_ENV_SECT_SIZE      0x50000 /* see README - env sector total size   */
+#define CONFIG_ENV_SECT_SIZE   0x50000 /* see README - env sector total size   */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration