Merge commit 'origin/master'

[oweals/u-boot.git] / include / configs / atstk1002.h

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 572ac23d3e9abf33816facaca592ee4b786f99d1..265264efbbb1b00666be4ebe32f4aac0947ad12b 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -201,10 +201,9 @@
 #define CFG_LONGHELP                   1
 
 #define CFG_MEMTEST_START                                              \
-       ({ DECLARE_GLOBAL_DATA_PTR; gd->bd->bi_dram[0].start; })
+       ({ 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_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }