diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:14:26 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:14:26 +0100 |
| commit | 92915741fc7c77175680e036965fb88d7552d743 (patch) | |
| tree | ea4fd23ae70a1e9f444582cf98529dc21358e612 /include/configs | |
| parent | d9da0a394a141cf188d646dd89e30c083526ce77 (diff) | |
| parent | d38da537943cd36356b9d3d9d9b60533554b81d8 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/atngw100.h | 10 | ||||
| -rw-r--r-- | include/configs/atstk1002.h | 4 | ||||
| -rw-r--r-- | include/configs/atstk1004.h | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 414e130bb5..5aad043d89 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -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 */ diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index b33e26fe01..95aeab6d4e 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -184,8 +184,8 @@ #define CFG_MALLOC_LEN (256*1024) #define CFG_DMA_ALLOC_LEN (16384) -/* Allow 2MB for the kernel run-time image */ -#define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00200000) +/* Allow 4MB for the kernel run-time image */ +#define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00400000) #define CFG_BOOTPARAMS_LEN (16 * 1024) /* Other configuration settings that shouldn't have to change all that often */ diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 1bad171cbf..b81fc21270 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -167,7 +167,7 @@ #define CFG_MALLOC_LEN (256*1024) -/* Allow 4MB for the kernel run-time image */ +/* Allow 2MB for the kernel run-time image */ #define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00200000) #define CFG_BOOTPARAMS_LEN (16 * 1024) |