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 /board/karo | |
| parent | 083d506937002f2795c80fe0c3ae194ad2c3d085 (diff) | |
| parent | bafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4 (diff) | |
| download | u-boot-imx-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.zip u-boot-imx-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.tar.gz u-boot-imx-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.tar.bz2 | |
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 'board/karo')
| -rw-r--r-- | board/karo/tx25/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/karo/tx25/config.mk b/board/karo/tx25/config.mk index 4283c3e..18b2883 100644 --- a/board/karo/tx25/config.mk +++ b/board/karo/tx25/config.mk @@ -1,5 +1,5 @@ ifdef CONFIG_NAND_SPL CONFIG_SYS_TEXT_BASE = 0x810c0000 else -CONFIG_SYS_TEXT_BASE = 0x81fc0000 +CONFIG_SYS_TEXT_BASE = 0x81200000 endif |