Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev

[u-boot] / include / configs / atngw100.h

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index b38c8133b70264eac084f135e4912532cdfe957b..5aad043d89e1815b6c17271463086b9ad4154c19 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -81,7 +81,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"
 #define CONFIG_AUTOBOOT_DELAY_STR      "d"
 #define CONFIG_AUTOBOOT_STOP_STR       " "
 
@@ -170,13 +170,9 @@
 #define CFG_PBSIZE                     (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
 #define CFG_LONGHELP                   1
 
-#define CFG_MEMTEST_START                                              \
-       ({ DECLARE_GLOBAL_DATA_PTR; gd->bd->bi_dram[0].start; })
-#define CFG_MEMTEST_END                                                        \
-       ({                                                              \
-               DECLARE_GLOBAL_DATA_PTR;                                \
-               gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;     \
-       })
+#define CFG_MEMTEST_START              CFG_SDRAM_BASE
+#define CFG_MEMTEST_END                        (CFG_MEMTEST_START + 0x1f00000)
+
 #define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
 
 #endif /* __CONFIG_H */