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/LaCie | |
| parent | 083d506937002f2795c80fe0c3ae194ad2c3d085 (diff) | |
| parent | bafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4 (diff) | |
| download | u-boot-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.tar.gz u-boot-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.tar.bz2 u-boot-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.zip | |
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/LaCie')
| -rw-r--r-- | board/LaCie/edminiv2/config.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/LaCie/edminiv2/config.mk b/board/LaCie/edminiv2/config.mk index d07642f5cf..2ffd1250af 100644 --- a/board/LaCie/edminiv2/config.mk +++ b/board/LaCie/edminiv2/config.mk @@ -24,4 +24,5 @@ # MA 02110-1301 USA # -CONFIG_SYS_TEXT_BASE = 0x00100000 +# TEXT_BASE must equal the intended FLASH location of u-boot. +CONFIG_SYS_TEXT_BASE = 0xfff90000 |