rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index a528ddf..e3084d4 100644 (file)
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -110,8 +110,8 @@
 #define CONFIG_BOOTDELAY               1
 #define CONFIG_AUTOBOOT                        1
 #define CONFIG_AUTOBOOT_KEYED          1
-#define CONFIG_AUTOBOOT_PROMPT                         \
-       "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_DELAY_STR      "d"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 
@@ -136,6 +136,7 @@
 #define CONFIG_PIO2                    1
 #define CFG_HSDRAMC                    1
 #define CONFIG_MMC                     1
+#define CONFIG_ATMEL_MCI               1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32
@@ -145,7 +146,7 @@
 /* External flash on STK1000 */
 #if 0
 #define CFG_FLASH_CFI                  1
-#define CFG_FLASH_CFI_DRIVER           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #endif
 
 #define CFG_FLASH_BASE                 0x00000000
@@ -159,9 +160,9 @@
 #define CFG_INTRAM_SIZE                        INTERNAL_SRAM_SIZE
 #define CFG_SDRAM_BASE                 EBI_SDRAM_BASE
 
-#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)