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/config.h | |
| parent | 083d506937002f2795c80fe0c3ae194ad2c3d085 (diff) | |
| parent | bafe7437a4c21a8935ffbb5dfe8b5f1994b9f1d4 (diff) | |
| download | olio-uboot-2014.01-6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf.tar.xz olio-uboot-2014.01-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 'arch/arm/include/asm/config.h')
| -rw-r--r-- | arch/arm/include/asm/config.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index d8e33fc51..4124f0a99 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 |