diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:19:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:19:57 +0200 |
| commit | 7a68389a231ac061ba2ffd628f86e15ed0545a7b (patch) | |
| tree | 723fd35290b988810be6d417c21fa1949f25aae8 /include/configs/atstk1002.h | |
| parent | 7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc (diff) | |
| parent | a8092c021d27f27f4b323b7d49979ca01b3fc19d (diff) | |
| download | u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.zip u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.tar.gz u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.tar.bz2 | |
Merge remote branch 'u-boot-avr32/master'
Diffstat (limited to 'include/configs/atstk1002.h')
| -rw-r--r-- | include/configs/atstk1002.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 95aeab6..ba18eb6 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.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_AT32AP7000 1 @@ -139,9 +141,9 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC -#define CONFIG_CMD_REGINFO #undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_FPGA #undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_XIMG @@ -170,10 +172,9 @@ #define CFG_MONITOR_BASE CFG_FLASH_BASE -#define CFG_INTRAM_BASE 0x24000000 -#define CFG_INTRAM_SIZE 0x8000 - -#define CFG_SDRAM_BASE 0x10000000 +#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 @@ -185,17 +186,17 @@ #define CFG_DMA_ALLOC_LEN (16384) /* Allow 4MB for the kernel run-time image */ -#define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00400000) +#define CFG_LOAD_ADDR (EBI_SDRAM_BASE + 0x00400000) #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 8 +#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 } |