Reinhard Meyer provided a good summary of the current mess of ARM relocation related config options we have at the moment, cf. http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/87679/focus=87842
Given the fact that ARM boards need to be adapted to the new relocation support anyway, we may as well take this opportunity and make the code a bit cleaner and easier to read. It is supposed that this will make the neccessary adapptions just easier.
NOTE: this patch series is in violation with the grace period announced in doc/feature-removal-schedule.txt, but actually we don;t make the situation any worse, as CONFIG_SYS_ARM_WITHOUT_RELOC does not work anyway.
Wolfgang Denk (3): Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_BROKEN_RELOC_FIXUP Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC Drop support for CONFIG_SKIP_RELOCATE_UBOOT
Makefile | 1 - README | 18 +-- arch/arm/config.mk | 5 - arch/arm/cpu/arm1136/start.S | 131 ---------------- arch/arm/cpu/arm1176/start.S | 218 -------------------------- arch/arm/cpu/arm720t/start.S | 107 ------------- arch/arm/cpu/arm920t/start.S | 146 ------------------ arch/arm/cpu/arm925t/start.S | 123 --------------- arch/arm/cpu/arm926ejs/orion5x/dram.c | 15 -- arch/arm/cpu/arm926ejs/start.S | 100 ------------ arch/arm/cpu/arm946es/start.S | 87 ----------- arch/arm/cpu/arm_intcm/start.S | 89 ----------- arch/arm/cpu/armv7/omap3/emif4.c | 24 --- arch/arm/cpu/armv7/omap3/sdrc.c | 28 ---- arch/arm/cpu/armv7/omap4/board.c | 5 - arch/arm/cpu/armv7/start.S | 117 -------------- arch/arm/cpu/ixp/start.S | 205 ------------------------- arch/arm/cpu/lh7a40x/start.S | 115 -------------- arch/arm/cpu/pxa/start.S | 32 +--- arch/arm/cpu/s3c44b0/start.S | 87 ----------- arch/arm/cpu/sa1100/start.S | 90 ----------- arch/arm/include/asm/config.h | 3 - arch/arm/include/asm/global_data.h | 2 - arch/arm/include/asm/u-boot-arm.h | 6 - arch/arm/lib/board.c | 260 -------------------------------- arch/arm/lib/cache-cp15.c | 19 --- arch/arm/lib/interrupts.c | 6 - arch/avr32/include/asm/config.h | 2 + arch/avr32/lib/board.c | 4 +- arch/blackfin/include/asm/config.h | 3 - arch/i386/include/asm/config.h | 2 - arch/m68k/include/asm/config.h | 2 + arch/m68k/lib/board.c | 4 +- arch/microblaze/include/asm/config.h | 3 - arch/mips/include/asm/config.h | 2 + arch/mips/lib/board.c | 4 +- arch/nios2/include/asm/config.h | 3 - arch/powerpc/include/asm/config.h | 3 - arch/sh/include/asm/config.h | 3 - arch/sparc/include/asm/config.h | 2 + arch/sparc/lib/board.c | 4 +- board/davinci/common/misc.c | 10 -- board/keymile/km_arm/km_arm.c | 15 -- board/ttcontrol/vision2/vision2.c | 14 -- common/cmd_bdinfo.c | 2 - common/cmd_bmp.c | 2 +- common/cmd_bootm.c | 2 +- common/cmd_date.c | 6 +- common/cmd_i2c.c | 2 +- common/cmd_nvedit.c | 2 +- common/cmd_onenand.c | 2 +- common/command.c | 2 +- common/dlmalloc.c | 2 +- common/env_common.c | 2 +- common/hush.c | 4 +- common/image.c | 8 +- common/serial.c | 2 +- common/stdio.c | 4 +- disk/part.c | 4 +- doc/README.arm-relocation | 8 - doc/feature-removal-schedule.txt | 27 ---- drivers/mtd/nand/nand.c | 2 +- drivers/net/phy/miiphybb.c | 2 +- fs/ubifs/ubifs.c | 2 +- include/command.h | 2 +- include/configs/SMN42.h | 1 - include/configs/afeb9260.h | 1 - include/configs/at91cap9adk.h | 1 - include/configs/at91rm9200dk.h | 2 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/cmc_pu2.h | 2 - include/configs/colibri_pxa270.h | 1 - include/configs/cpuat91.h | 1 - include/configs/csb637.h | 2 - include/configs/da830evm.h | 1 - include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 3 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 3 - include/configs/dnp1110.h | 1 - include/configs/gcplus.h | 1 - include/configs/imx31_litekit.h | 1 - include/configs/jornada.h | 1 - include/configs/kb9202.h | 2 - include/configs/lpc2292sodimm.h | 1 - include/configs/meesc.h | 1 - include/configs/mp2usb.h | 2 - include/configs/mx31pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/netstar.h | 3 - include/configs/otc570.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pxa255_idp.h | 1 - include/configs/s5p_goni.h | 2 - include/configs/sbc35_a9g20.h | 1 - include/configs/shannon.h | 1 - include/configs/smdk6400.h | 2 - include/configs/smdkc100.h | 2 - include/configs/tny_a9260.h | 1 - include/configs/vision2.h | 7 - include/configs/zipitz2.h | 1 - include/configs/zylonite.h | 1 - include/post.h | 2 +- nand_spl/nand_boot.c | 2 +- nand_spl/nand_boot_fsl_nfc.c | 2 +- post/post.c | 2 +- 116 files changed, 62 insertions(+), 2221 deletions(-)