diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-28 20:35:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:39:59 +0200 |
| commit | a9aa3926295df759306258e5e24cace414f53b67 (patch) | |
| tree | b63739471ef3aaebad27fd610f8394fee35120b5 /arch/arm/cpu/armv7/omap4/board.c | |
| parent | 2e5167ccad93ca9cfa6a2acfab5e4785418e477e (diff) | |
| download | u-boot-imx-a9aa3926295df759306258e5e24cace414f53b67.zip u-boot-imx-a9aa3926295df759306258e5e24cace414f53b67.tar.gz u-boot-imx-a9aa3926295df759306258e5e24cace414f53b67.tar.bz2 | |
Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC
When this define was introduced, the idea was to provide a soft
migration path for ARM boards to get adapted to the new relocation
support. However, other recent changes led to a different
implementation (ELF relocation), where this no longer works. By now
CONFIG_SYS_ARM_WITHOUT_RELOC does not only not help any more, but it
actually hurts because it obfuscates the actual code by sprinkling it
with lots of dead and non-working debris.
So let's make a clean cut and drop CONFIG_SYS_ARM_WITHOUT_RELOC.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/board.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index 24a66f5..e7651d2 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -102,12 +102,7 @@ int dram_init(void) { DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) - gd->bd->bi_dram[0].start = 0x80000000; - gd->bd->bi_dram[0].size = sdram_size(); -#else gd->ram_size = sdram_size(); -#endif return 0; } |