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 /arch/arm/include/asm | |
| 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 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/config.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/u-boot-arm.h | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index d8e33fc..4124f0a 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -21,10 +21,9 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) /* Relocation to SDRAM works on all ARM boards */ #define CONFIG_RELOC_FIXUP_WORKS -#endif + #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #endif diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index faf800a..4ac4f61 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -30,18 +30,18 @@ #define _U_BOOT_ARM_H_ 1 /* for the following variables, see start.S */ -extern ulong _bss_start; /* code + data end == BSS start */ -extern ulong _bss_end; /* BSS end */ +extern ulong _bss_start_ofs; /* BSS start relative to _start */ +extern ulong _bss_end_ofs; /* BSS end relative to _start */ extern ulong IRQ_STACK_START; /* top of IRQ stack */ extern ulong FIQ_STACK_START; /* top of FIQ stack */ #if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) -extern ulong _armboot_start; /* code start */ +extern ulong _armboot_start_ofs; /* code start */ #else extern ulong _TEXT_BASE; /* code start */ -extern ulong _datarel_start; -extern ulong _datarelrolocal_start; -extern ulong _datarellocal_start; -extern ulong _datarelro_start; +extern ulong _datarel_start_ofs; +extern ulong _datarelrolocal_start_ofs; +extern ulong _datarellocal_start_ofs; +extern ulong _datarelro_start_ofs; extern ulong IRQ_STACK_START_IN; /* 8 bytes in IRQ stack */ #endif |