rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index b81fc21..c87c5b7 100644 (file)
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -24,6 +24,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <asm/arch/memory-map.h>
+
 #define CONFIG_AVR32                   1
 #define CONFIG_AT32AP                  1
 #define CONFIG_AT32AP7002              1
@@ -108,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       " "
 
@@ -134,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
@@ -143,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
@@ -153,32 +156,30 @@
 
 #define CFG_MONITOR_BASE               CFG_FLASH_BASE
 
-#define CFG_INTRAM_BASE                        0x24000000
-#define CFG_INTRAM_SIZE                        0x8000
-
-#define CFG_SDRAM_BASE                 0x10000000
-#define CFG_SDRAM_16BIT                        1
+#define CFG_INTRAM_BASE                        INTERNAL_SRAM_BASE
+#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)
 
 #define CFG_MALLOC_LEN                 (256*1024)
 
 /* Allow 2MB for the kernel run-time image */
-#define CFG_LOAD_ADDR                  (CFG_SDRAM_BASE + 0x00200000)
+#define CFG_LOAD_ADDR                  (EBI_SDRAM_BASE + 0x00200000)
 #define CFG_BOOTPARAMS_LEN             (16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CFG_PROMPT                     "Uboot> "
+#define CFG_PROMPT                     "U-Boot> "
 #define CFG_CBSIZE                     256
 #define CFG_MAXARGS                    16
 #define CFG_PBSIZE                     (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
 #define CFG_LONGHELP                   1
 
-#define CFG_MEMTEST_START              CFG_SDRAM_BASE
+#define CFG_MEMTEST_START              EBI_SDRAM_BASE
 #define CFG_MEMTEST_END                        (CFG_MEMTEST_START + 0x700000)
 #define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }