diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-19 21:07:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 21:07:52 +0200 |
| commit | 6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf (patch) | |
| tree | a6a58200f5ea04c6d4ad2260dd031fcc6e4183ce /include | |
| parent | 083d506937002f2795c80fe0c3ae194ad2c3d085 (diff) | |
| parent | bafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4 (diff) | |
Merge branch 'elf_reloc'
Conflicts:
arch/arm/include/asm/config.h
board/LaCie/edminiv2/config.mk
board/karo/tx25/config.mk
board/logicpd/imx27lite/config.mk
doc/README.arm-relocation
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/edminiv2.h | 5 | ||||
| -rw-r--r-- | include/configs/tx25.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index ccfc66053..43e5e870f 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -223,4 +223,9 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 #define CONFIG_SYS_MAXARGS 16 +/* additions for new relocation code, must be added to all boards */ +#define CONFIG_SYS_SDRAM_BASE 0 +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 0x1000 - CONFIG_SYS_GBL_DATA_SIZE) + #endif /* _CONFIG_EDMINIV2_H */ diff --git a/include/configs/tx25.h b/include/configs/tx25.h index bcc8140df..996afa3b0 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -41,7 +41,7 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x800 #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x30000 -#define CONFIG_SYS_NAND_U_BOOT_DST (0x81fc0000) +#define CONFIG_SYS_NAND_U_BOOT_DST (0x81200000) #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST #define CONFIG_SYS_NAND_PAGE_SIZE 2048 |