ARM Relocation Config Cleanup
Subsystems (16)
cover ARM Relocation Config Cleanup
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(-)
RFC PATCH 1/3 Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_BROKEN_RELOC_FIXUP
By now, the majority of architectures have working relocation support, so the few remaining architectures have become exceptions. To make this more obvious, we make working relocation now the default case, and flag the remaining cases with CONFIG_BROKEN_RELOC_FIXUP.
--- arch/arm/include/asm/config.h | 3 --- arch/arm/lib/board.c | 32 -------------------------------- 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 ++-- 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 | 5 ++--- drivers/mtd/nand/nand.c | 2 +- drivers/net/phy/miiphybb.c | 2 +- fs/ubifs/ubifs.c | 2 +- include/command.h | 2 +- include/post.h | 2 +- post/post.c | 2 +- 37 files changed, 46 insertions(+), 91 deletions(-)
arch/arm/include/asm/config.h +0 -3
@@ -21,9 +21,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -/* Relocation to SDRAM works on all ARM boards */ -#define CONFIG_RELOC_FIXUP_WORKS -#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #endif
arch/arm/lib/board.c +0 -32
@@ -679,15 +679,6 @@ void board_init_r (gd_t *id, ulong dest_addr)#if !defined(CONFIG_SYS_NO_FLASH )ulong flash_size;#endif -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) -extern void malloc_bin_reloc (void ); -#if defined(CONFIG_CMD_BMP ) -extern void bmp_reloc (void ); -#endif -#if defined(CONFIG_CMD_I2C ) -extern void i2c_reloc (void ); -#endif -#endif gd = id; bd = gd->bd;
@@ -704,39 +695,16 @@ void board_init_r (gd_t *id, ulong dest_addr)debug ("Now running in RAM - U-Boot at: %08lx\n" , dest_addr); -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) -/* -* We have to relocate the command table manually -*/ -fixup_cmdtable (&__u_boot_cmd_start, - (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); -#if defined(CONFIG_CMD_BMP ) -bmp_reloc (); -#endif -#if defined(CONFIG_CMD_I2C ) -i2c_reloc (); -#endif -#if defined(CONFIG_CMD_ONENAND ) -onenand_reloc (); -#endif -#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ -#ifdef CONFIG_LOGBUFFER logbuff_init_ptrs ();#endif #ifdef CONFIG_POST post_output_backlog (); -#ifndef CONFIG_RELOC_FIXUP_WORKS -post_reloc (); -#endif #endif /* The Malloc area is immediately below the monitor copy in DRAM */ malloc_start = dest_addr -TOTAL_MALLOC_LEN ;mem_malloc_init (malloc_start,TOTAL_MALLOC_LEN ); -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) -malloc_bin_reloc (); -#endif #if !defined(CONFIG_SYS_NO_FLASH )puts ("FLASH: " );
arch/avr32/include/asm/config.h +2 -0
@@ -21,4 +21,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ +#define CONFIG_BROKEN_RELOC_FIXUP +#endif
arch/avr32/lib/board.c +2 -2
@@ -272,13 +272,13 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) monitor_flash_len = _edata - _text; -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* * We have to relocate the command table manually */ fixup_cmdtable (&__u_boot_cmd_start, (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); -#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ +#endif /* defined(CONFIG_BROKEN_RELOC_FIXUP) */ /* there are some other pointer constants we must deal with */ #ifndef CONFIG_ENV_IS_NOWHERE
arch/blackfin/include/asm/config.h +0 -3
@@ -13,9 +13,6 @@# define CONFIG_BFIN_SCRATCH_REG retn#endif -/* Relocation to SDRAM works on all Blackfin boards */ -#define CONFIG_RELOC_FIXUP_WORKS -/* Make sure the structure is properly aligned */ #if ((CONFIG_SYS_GBL_DATA_ADDR &-4 ) !=CONFIG_SYS_GBL_DATA_ADDR )# error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned
arch/i386/include/asm/config.h +0 -2
@@ -21,6 +21,4 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -#define CONFIG_RELOC_FIXUP_WORKS -#endif
arch/m68k/include/asm/config.h +2 -0
@@ -21,6 +21,8 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ +#define CONFIG_BROKEN_RELOC_FIXUP +#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_GET_CMDLINE
arch/m68k/lib/board.c +2 -2
@@ -420,13 +420,13 @@ void board_init_r (gd_t *id, ulong dest_addr) monitor_flash_len = (ulong )&__init_end - dest_addr; -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* * We have to relocate the command table manually */ fixup_cmdtable (&__u_boot_cmd_start, (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); -#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ +#endif /* defined(CONFIG_BROKEN_RELOC_FIXUP) */ /* there are some other pointer constants we must deal with */ #ifndef CONFIG_ENV_IS_NOWHERE
arch/microblaze/include/asm/config.h +0 -3
@@ -21,7 +21,4 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -/* Relocation to SDRAM works on all Microblaze boards */ -#define CONFIG_RELOC_FIXUP_WORKS -#endif
arch/mips/include/asm/config.h +2 -0
@@ -21,4 +21,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ +#define CONFIG_BROKEN_RELOC_FIXUP +#endif
arch/mips/lib/board.c +2 -2
@@ -295,13 +295,13 @@ void board_init_r (gd_t *id, ulong dest_addr) monitor_flash_len = (ulong )&uboot_end_data - dest_addr; -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* * We have to relocate the command table manually */ fixup_cmdtable (&__u_boot_cmd_start, (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); -#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ +#endif /* defined(CONFIG_BROKEN_RELOC_FIXUP) */ /* there are some other pointer constants we must deal with */ #ifndef CONFIG_ENV_IS_NOWHERE
arch/nios2/include/asm/config.h +0 -3
@@ -21,7 +21,4 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -/* Relocation to SDRAM works on all NIOS2 boards */ -#define CONFIG_RELOC_FIXUP_WORKS -#endif
arch/powerpc/include/asm/config.h +0 -3
@@ -89,9 +89,6 @@#define CONFIG_SYS_NUM_TLBCAMS 16#endif -/* Relocation to SDRAM works on all PPC boards */ -#define CONFIG_RELOC_FIXUP_WORKS -/* Since so many PPC SOCs have a semi-common LBC, define this here */ #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) || \ defined(CONFIG_MPC83xx)
arch/sh/include/asm/config.h +0 -3
@@ -21,7 +21,4 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -/* Relocation to SDRAM works on all sh boards */ -#define CONFIG_RELOC_FIXUP_WORKS -#endif
arch/sparc/include/asm/config.h +2 -0
@@ -21,6 +21,8 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ +#define CONFIG_BROKEN_RELOC_FIXUP +#define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
arch/sparc/lib/board.c +2 -2
@@ -252,13 +252,13 @@ void board_init_f(ulong bootflag)post_run (NULL ,POST_ROM |post_bootmode_get (0 ));#endif -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* * We have to relocate the command table manually */ fixup_cmdtable (&__u_boot_cmd_start, (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start)); -#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */ +#endif /* defined(CONFIG_BROKEN_RELOC_FIXUP) */ #if defined(CONFIG_CMD_AMBAPP ) && defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP )puts ("AMBA:\n" );
common/cmd_bmp.c +1 -1
@@ -137,7 +137,7 @@ static cmd_tbl_t cmd_bmp_sub[] = { U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""), }; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void bmp_reloc (void ) {fixup_cmdtable (cmd_bmp_sub,ARRAY_SIZE (cmd_bmp_sub)); }
common/cmd_bootm.c +1 -1
@@ -590,7 +590,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])ulong load_end =0 ;int ret;boot_os_fn *boot_fn; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP static int relocated =0 ;/* relocate boot function table */
common/cmd_date.c +3 -3
@@ -35,10 +35,10 @@ const char *weekdays[] = { "Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur", }; -#ifdef CONFIG_RELOC_FIXUP_WORKS -#define RELOC (a) a -#else +#ifdef CONFIG_BROKEN_RELOC_FIXUP #define RELOC (a) ((typeof(a))((unsigned long)(a) + gd->reloc_off)) +#else +#define RELOC (a) a#endif int mk_date (char *,struct rtc_time *);
common/cmd_i2c.c +1 -1
@@ -1284,7 +1284,7 @@ static cmd_tbl_t cmd_i2c_sub[] = { U_BOOT_CMD_MKENT(speed, 1, 1, do_i2c_bus_speed, "", ""), }; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void i2c_reloc (void ) {fixup_cmdtable (cmd_i2c_sub,ARRAY_SIZE (cmd_i2c_sub)); }
common/cmd_nvedit.c +1 -1
@@ -837,7 +837,7 @@ static cmd_tbl_t cmd_env_sub[] = { U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), }; -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )void env_reloc (void ) {fixup_cmdtable (cmd_env_sub,ARRAY_SIZE (cmd_env_sub));
common/cmd_onenand.c +1 -1
@@ -525,7 +525,7 @@ static cmd_tbl_t cmd_onenand_sub[] = { U_BOOT_CMD_MKENT(markbad, CONFIG_SYS_MAXARGS, 0, do_onenand_markbad, "", ""), }; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void onenand_reloc (void ) {fixup_cmdtable (cmd_onenand_sub,ARRAY_SIZE (cmd_onenand_sub)); }
common/command.c +1 -1
@@ -466,7 +466,7 @@ int cmd_get_data_size(char* arg, int default_size) }#endif -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )DECLARE_GLOBAL_DATA_PTR ;void fixup_cmdtable (cmd_tbl_t *cmdtp,int size)
common/dlmalloc.c +1 -1
@@ -1491,7 +1491,7 @@ static mbinptr av_[NAV * 2 + 2] = {IAV (120 ),IAV (121 ),IAV (122 ),IAV (123 ),IAV (124 ),IAV (125 ),IAV (126 ),IAV (127 ) }; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void malloc_bin_reloc (void ) {unsigned long *p = (unsigned long *)(&av_[2 ]);
common/env_common.c +1 -1
@@ -227,7 +227,7 @@ int env_import(const char *buf, int check)void env_relocate (void ) { -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )extern void env_reloc (void );env_reloc ();
common/hush.c +2 -2
@@ -3268,7 +3268,7 @@ int parse_file_outer(void) } #ifdef __U_BOOT__ -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP static void u_boot_hush_reloc(void) { unsigned long addr;
@@ -3290,7 +3290,7 @@ int u_boot_hush_start(void) top_vars->next =0 ; top_vars->flg_export =0 ; top_vars->flg_read_only =1 ; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP u_boot_hush_reloc ();#endif }
common/image.c +4 -4
@@ -520,7 +520,7 @@ char *get_table_entry_name (table_entry_t *table, char *msg, int id) {for (; table->id >=0 ; ++table) { if (table->id == id) -#if defined(USE_HOSTCC ) || defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(USE_HOSTCC ) || !defined(CONFIG_BROKEN_RELOC_FIXUP )return table->lname;#else return table->lname + gd->reloc_off;
@@ -585,10 +585,10 @@ int get_table_entry_id (table_entry_t *table,fprintf (stderr,"\n" );#else for (t = table; t->id >=0 ; ++t) { -#ifdef CONFIG_RELOC_FIXUP_WORKS -if (t->sname &&strcmp (t->sname, name) ==0 ) -#else +#ifdef CONFIG_BROKEN_RELOC_FIXUP if (t->sname &&strcmp (t->sname + gd->reloc_off, name) ==0 ) +#else + if (t->sname && strcmp(t->sname, name) == 0)#endif return (t->id); }
common/serial.c +1 -1
@@ -99,7 +99,7 @@ struct serial_device *default_serial_console(void) __attribute__((weak, alias("_int serial_register (struct serial_device *dev) { -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP dev->init += gd->reloc_off; dev->setbrg += gd->reloc_off; dev->getc += gd->reloc_off;
common/stdio.c +2 -2
@@ -193,7 +193,7 @@ int stdio_deregister(char *devname)int stdio_init (void ) { -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* already relocated for current ARM implementation */ ulong relocation_offset = gd->reloc_off;int i;
@@ -203,7 +203,7 @@ int stdio_init (void) stdio_names[i] = (char *) (((ulong ) stdio_names[i]) + relocation_offset); } -#endif /* !CONFIG_RELOC_FIXUP_WORKS */ +#endif /* CONFIG_BROKEN_RELOC_FIXUP */ /* Initialize the list */ INIT_LIST_HEAD (&(devs.list));
disk/part.c +2 -2
@@ -81,13 +81,13 @@ block_dev_desc_t *get_dev(char* ifname, int dev)char *name; name = drvr->name; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP name += gd->reloc_off;#endif while (name) { name = drvr->name; reloc_get_dev = drvr->get_dev; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP name += gd->reloc_off; reloc_get_dev += gd->reloc_off;#endif
doc/README.arm-relocation +2 -3
@@ -36,15 +36,14 @@ At lib level: At config level: - Define CONFIG_RELOC_FIXUP_WORKS. Undefine CONFIG_SYS_ARM_WITHOUT_RELOC * WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING * Boards which are not fixed to support relocation will be REMOVED! -Eventually, CONFIG_SYS_ARM_WITHOUT_RELOC and CONFIG_RELOC_FIXUP_WORKS will -disappear and boards which have to migrated to relocation will disappear too. +Eventually, CONFIG_SYS_ARM_WITHOUT_RELOC will disappear and boards +which have to migrated to relocation will disappear too. -----------------------------------------------------------------------------
drivers/mtd/nand/nand.c +1 -1
@@ -54,7 +54,7 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,if (nand_scan (mtd, maxchips) ==0 ) {if (!mtd->name) mtd->name = (char *)default_nand_name; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP else mtd->name += gd->reloc_off;#endif
drivers/net/phy/miiphybb.c +1 -1
@@ -127,7 +127,7 @@ void bb_miiphy_init(void)int i;for (i =0 ; i < bb_miiphy_buses_num; i++) { -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )/* Relocate the hook pointers*/ BB_MII_RELOCATE (bb_miiphy_buses[i].init, gd->reloc_off);BB_MII_RELOCATE (bb_miiphy_buses[i].mdio_active, gd->reloc_off);
fs/ubifs/ubifs.c +1 -1
@@ -121,7 +121,7 @@ static int __init compr_init(struct ubifs_compressor *compr) { ubifs_compressors[compr->compr_type] = compr; -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP ubifs_compressors[compr->compr_type]->name += gd->reloc_off; ubifs_compressors[compr->compr_type]->capi_name += gd->reloc_off; ubifs_compressors[compr->compr_type]->decompress += gd->reloc_off;
include/command.h +1 -1
@@ -125,7 +125,7 @@ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}#endif /* CONFIG_SYS_LONGHELP */ -#if !defined(CONFIG_RELOC_FIXUP_WORKS ) +#if defined(CONFIG_BROKEN_RELOC_FIXUP )void fixup_cmdtable (cmd_tbl_t *cmdtp,int size);#endif #endif /* __COMMAND_H */
include/post.h +1 -1
@@ -137,7 +137,7 @@ void post_output_backlog ( void );int post_run (char *name,int flags);int post_info (char *name);int post_log (char *format, ...); -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void post_reloc (void );#endif unsigned long post_time_ms (unsigned long base);
post/post.c +1 -1
@@ -422,7 +422,7 @@ int post_log (char *format, ...)return 0 ; } -#ifndef CONFIG_RELOC_FIXUP_WORKS +#ifdef CONFIG_BROKEN_RELOC_FIXUP void post_reloc (void ) {unsigned int i;
Signature · 1 line
1.7.2.3
RFC PATCH 1/3 Replace CONFIG_RELOC_FIXUP_WORKS by CONFIG_BROKEN_RELOC_FIXUP
Quoted 37 lines · In message <[email protected]> you wrote:
By now, the majority of architectures have working relocation support, so the few remaining architectures have become exceptions. To make this more obvious, we make working relocation now the default case, and flag the remaining cases with
CONFIG_BROKEN_RELOC_FIXUP.Signed-off-by Wolfgang Denk <[email protected]>--- arch/arm/include/asm/config.h | 3 --- arch/arm/lib/board.c | 32 -------------------------------- 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 ++-- 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 ++--
Quoted 8 lines
doc/README.arm-relocation | 5 ++--- drivers/mtd/nand/nand.c | 2 +- drivers/net/phy/miiphybb.c | 2 +- fs/ubifs/ubifs.c | 2 +- include/command.h | 2 +- include/post.h | 2 +- post/post.c | 2 +- 37 files changed, 46 insertions(+), 91 deletions(-)
Applied (in the changed version using "CONFIG_NEEDS_MANUAL_RELOC" instead of "CONFIG_BROKEN_RELOC_FIXUP."
Best regards,
Wolfgang Denk
Signature · 8 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de You say you are lying. But if everything you say is a lie, then you are telling the truth. You cannot tell the truth because everything you say is a lie. You lie, you tell the truth ... but you cannot, for you lie. -- Norman the android, "I, Mudd", stardate 4513.3
RFC PATCH 2/3 Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC
In reply to Wolfgang DenkWhen 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.
--- arch/arm/config.mk | 5 - arch/arm/cpu/arm1136/start.S | 127 ------------------ arch/arm/cpu/arm1176/start.S | 214 ------------------------------- arch/arm/cpu/arm720t/start.S | 105 --------------- arch/arm/cpu/arm920t/start.S | 144 --------------------- arch/arm/cpu/arm925t/start.S | 121 ----------------- arch/arm/cpu/arm926ejs/orion5x/dram.c | 15 -- arch/arm/cpu/arm926ejs/start.S | 96 -------------- arch/arm/cpu/arm946es/start.S | 85 ------------ arch/arm/cpu/arm_intcm/start.S | 87 ------------- 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 | 113 ---------------- arch/arm/cpu/ixp/start.S | 203 ----------------------------- arch/arm/cpu/lh7a40x/start.S | 113 ---------------- arch/arm/cpu/pxa/start.S | 28 +--- arch/arm/cpu/s3c44b0/start.S | 85 ------------ arch/arm/cpu/sa1100/start.S | 88 ------------- arch/arm/include/asm/global_data.h | 2 - arch/arm/include/asm/u-boot-arm.h | 6 - arch/arm/lib/board.c | 228 --------------------------------- arch/arm/lib/cache-cp15.c | 19 --- arch/arm/lib/interrupts.c | 6 - 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 - doc/README.arm-relocation | 7 - doc/feature-removal-schedule.txt | 27 ---- include/configs/imx31_litekit.h | 1 - include/configs/jornada.h | 1 - include/configs/vision2.h | 5 - nand_spl/nand_boot.c | 2 +- nand_spl/nand_boot_fsl_nfc.c | 2 +- 35 files changed, 10 insertions(+), 2023 deletions(-)
arch/arm/config.mk +0 -5
@@ -33,9 +33,6 @@ STANDALONE_LOAD_ADDR = 0xc100000 endif endif -ifdef CONFIG_SYS_ARM_WITHOUT_RELOC -PLATFORM_CPPFLAGS += -DCONFIG_SYS_ARM_WITHOUT_RELOC -endif PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
@@ -68,9 +65,7 @@ endif endif LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds -ifndef CONFIG_SYS_ARM_WITHOUT_RELOC # needed for relocation ifndef CONFIG_NAND_SPL PLATFORM_LDFLAGS += -pie endif -endif
arch/arm/cpu/arm1136/start.S +0 -127
165 lines not on this page · raw message
arch/arm/cpu/arm1176/start.S +0 -214
253 lines not on this page · raw message
arch/arm/cpu/arm720t/start.S +0 -105
137 lines not on this page · raw message
arch/arm/cpu/arm920t/start.S +0 -144
176 lines not on this page · raw message
arch/arm/cpu/arm925t/start.S +0 -121
153 lines not on this page · raw message
arch/arm/cpu/arm926ejs/orion5x/dram.c +0 -15
@@ -49,20 +49,6 @@ u32 orion5x_sdram_bar(enum memory_bank bank) result = winregs[bank].base;return result; } -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -int dram_init (void ) -{ -int i; - -for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { - gd->bd->bi_dram[i].start =orion5x_sdram_bar (i); - gd->bd->bi_dram[i].size =get_ram_size ( - (volatile long *) (gd->bd->bi_dram[i].start), -CONFIG_MAX_RAM_BANK_SIZE ); - } -return 0 ; -} -#else int dram_init (void ) {/* dram_init must store complete ramsize in gd->ram_size */
@@ -83,4 +69,3 @@ void dram_init_banksize (void) CONFIG_MAX_RAM_BANK_SIZE); } } -#endif
arch/arm/cpu/arm926ejs/start.S +0 -96
122 lines not on this page · raw message
arch/arm/cpu/arm946es/start.S +0 -85
117 lines not on this page · raw message
arch/arm/cpu/arm_intcm/start.S +0 -87
119 lines not on this page · raw message
arch/arm/cpu/armv7/omap3/emif4.c +0 -24
@@ -136,29 +136,6 @@ void do_emif4_init(void)* dram_init - * - Sets uboots idea of sdram size */ -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -int dram_init (void ) -{ -DECLARE_GLOBAL_DATA_PTR ; -unsigned int size0 =0 , size1 =0 ; - - size0 =get_sdr_cs_size (CS0 ); -/* -* If a second bank of DDR is attached to CS1 this is -* where it can be started. Early init code will init -* memory on CS0. -*/ -if ((sysinfo.mtype ==DDR_COMBO ) || (sysinfo.mtype ==DDR_STACKED )) - size1 =get_sdr_cs_size (CS1 ); - - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size = size0; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_1 +get_sdr_cs_offset (CS1 ); - gd->bd->bi_dram[1 ].size = size1; - -return 0 ; -} -#else int dram_init (void ) {DECLARE_GLOBAL_DATA_PTR ;
@@ -190,7 +167,6 @@ void dram_init_banksize (void) gd->bd->bi_dram[1 ].start =PHYS_SDRAM_1 +get_sdr_cs_offset (CS1 ); gd->bd->bi_dram[1 ].size = size1; } -#endif /* * mem_init() -
arch/arm/cpu/armv7/omap3/sdrc.c +0 -28
@@ -163,33 +163,6 @@ void do_sdrc_init(u32 cs, u32 early)* dram_init - * - Sets uboots idea of sdram size */ -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -int dram_init (void ) -{ -DECLARE_GLOBAL_DATA_PTR ; -unsigned int size0 =0 , size1 =0 ; - - size0 =get_sdr_cs_size (CS0 ); -/* -* If a second bank of DDR is attached to CS1 this is -* where it can be started. Early init code will init -* memory on CS0. -*/ -if ((sysinfo.mtype ==DDR_COMBO ) || (sysinfo.mtype ==DDR_STACKED )) { -do_sdrc_init (CS1 ,NOT_EARLY ); -make_cs1_contiguous (); - - size1 =get_sdr_cs_size (CS1 ); - } - - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size = size0; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_1 +get_sdr_cs_offset (CS1 ); - gd->bd->bi_dram[1 ].size = size1; - -return 0 ; -} -#else int dram_init (void ) {DECLARE_GLOBAL_DATA_PTR ;
@@ -225,7 +198,6 @@ void dram_init_banksize (void) gd->bd->bi_dram[1 ].start =PHYS_SDRAM_1 +get_sdr_cs_offset (CS1 ); gd->bd->bi_dram[1 ].size = size1; } -#endif /* * mem_init -
arch/arm/cpu/armv7/omap4/board.c +0 -5
@@ -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 ; }
arch/arm/cpu/armv7/start.S +0 -113
155 lines not on this page · raw message
arch/arm/cpu/ixp/start.S +0 -203
235 lines not on this page · raw message
arch/arm/cpu/lh7a40x/start.S +0 -113
145 lines not on this page · raw message
arch/arm/cpu/pxa/start.S +8 -20
@@ -299,7 +299,7 @@ fixnext: add r2, r2, #8 /* each rel.dyn entry is 8 bytes */ cmp r2, r3 blo fixloop -#endif +#endif /* #ifndef CONFIG_PRELOADER */ #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss:
@@ -316,7 +316,7 @@ clbss_l:str r2, [r0] /* clear loop... */ add r0, r0, #4 cmp r0, r1 bne clbss_l -#endif +#endif /* #ifndef CONFIG_PRELOADER */ /* * We are done. Do not return, instead branch to second part of board
@@ -343,7 +343,7 @@ _start_oneboot_ofs _board_init_r_ofs: .word board_init_r - _start -#endif +#endif /* CONFIG_ONENAND_IPL */ _rel_dyn_start_ofs: .word __rel_dyn_start - _start
@@ -352,7 +352,7 @@ _rel_dyn_end_ofs: _dynsym_start_ofs: .word __dynsym_start - _start -#else /* #if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC) */ +#else /* CONFIG_PRELOADER */ /****************************************************************************/ /* */
@@ -377,7 +377,7 @@ reset: /* Start OneNAND IPL */ ldr pc, =start_oneboot -#endif /* #if !defined(CONFIG_ONENAND_IPL) */ +#endif /* CONFIG_PRELOADER */ #ifndef CONFIG_PRELOADER /****************************************************************************/
@@ -419,13 +419,7 @@ reset: stmia sp, {r0 - r12} /* Calling r0-r12 */ add r8, sp, #S_PC -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) - ldr r2, _armboot_start - sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN) - sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack -#else ldr r2, IRQ_STACK_START_IN -#endif ldmia r2, {r2 - r4} /* get pc, cpsr, old_r0 */ add r0, sp, #S_FRAME_SIZE /* restore sp_SVC */
@@ -460,13 +454,7 @@ reset: .endm .macro get_bad_stack -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC) - ldr r13, _armboot_start @ setup our mode stack - sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN) - sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack -#else ldr r13, IRQ_STACK_START_IN @ setup our mode stack -#endif str lr, [r13] @ save caller lr / spsr mrs lr, spsr
@@ -485,7 +473,7 @@ reset: .macro get_fiq_stack @ setup FIQ stack ldr sp, FIQ_STACK_START .endm -#endif /* CONFIG_PRELOADER */ +#endif /* CONFIG_PRELOADER /****************************************************************************/
@@ -499,7 +487,7 @@ reset: do_hang: ldr sp, _TEXT_BASE /* use 32 words abort stack */ bl hang /* hang and never return */ -#else /* !CONFIG_PRELOADER */ +#else .align 5 undefined_instruction: get_bad_stack
@@ -618,4 +606,4 @@ mmu_table: .word (__base << 20) | 0xc12 .set __base, __base + 1 .endr -#endif +#endif /* CONFIG_PRELOADER */
arch/arm/cpu/s3c44b0/start.S +0 -85
103 lines not on this page · raw message
arch/arm/cpu/sa1100/start.S +0 -88
120 lines not on this page · raw message
arch/arm/include/asm/global_data.h +0 -2
@@ -61,7 +61,6 @@ typedef struct global_data {unsigned long tbu;unsigned long long timer_reset_value;#endif -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )unsigned long relocaddr;/* Start address of U-Boot in RAM */ phys_size_t ram_size;/* RAM size */ unsigned long mon_len;/* monitor len */
@@ -71,7 +70,6 @@ typedef struct global_data {#if !(defined(CONFIG_SYS_NO_ICACHE ) && defined(CONFIG_SYS_NO_DCACHE ))unsigned long tlb_addr;#endif -#endif void **jt;/* jump table */ char env_buf[32 ];/* buffer for getenv() before reloc. */ } gd_t;
arch/arm/include/asm/u-boot-arm.h +0 -6
@@ -34,16 +34,12 @@ 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_ofs;/* code start */ -#else extern ulong _TEXT_BASE;/* code 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 /* cpu/.../cpu.c */ int cpu_init (void );
@@ -56,9 +52,7 @@ int arch_misc_init(void);/* board/.../... */ int board_init (void );int dram_init (void ); -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )void dram_init_banksize (void ); -#endif void setup_serial_tag (struct tag **params);void setup_revision_tag (struct tag **params);
arch/arm/lib/board.c +0 -228
260 lines not on this page · raw message
arch/arm/lib/cache-cp15.c +0 -19
@@ -44,7 +44,6 @@ static void cp_delay (void) asmvolatile ("" : : :"memory" ); } -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )static inline void dram_bank_mmu_setup (int bank) {u32 *page_table = (u32 *)gd->tlb_addr;
@@ -58,18 +57,11 @@ static inline void dram_bank_mmu_setup(int bank) page_table[i] = i <<20 | (3 <<10 ) |CACHE_SETUP ; } } -#endif /* to activate the MMU we need to set up virtual memory: use 1M areas */ static inline void mmu_setup (void ) { -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )u32 *page_table = (u32 *)gd->tlb_addr; -#else -static u32 __attribute__((aligned (16384 ))) page_table[4096 ]; -bd_t *bd = gd->bd; -int j; -#endif int i;u32 reg;
@@ -77,20 +69,9 @@ static inline void mmu_setup(void)for (i =0 ; i <4096 ; i++) page_table[i] = i <<20 | (3 <<10 ) |0x12 ; -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) {dram_bank_mmu_setup (i); } -#else -/* Then, enable cacheable and bufferable for RAM only */ -for (j =0 ; j <CONFIG_NR_DRAM_BANKS ; j++) { -for (i = bd->bi_dram[j].start >>20 ; - i < (bd->bi_dram[j].start + bd->bi_dram[j].size) >>20 ; - i++) { - page_table[i] = i <<20 | (3 <<10 ) |CACHE_SETUP ; - } - } -#endif /* Copy the page table address to cp15 */ asm volatile("mcr p15, 0, %0, c2, c0, 0"
arch/arm/lib/interrupts.c +0 -6
@@ -46,12 +46,8 @@ int interrupt_init (void)/* * setup up stacks if necessary */ -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )IRQ_STACK_START = gd->irq_sp -4 ;IRQ_STACK_START_IN = gd->irq_sp +8 ; -#else -IRQ_STACK_START = _armboot_start -CONFIG_SYS_MALLOC_LEN -GENERATED_GBL_DATA_SIZE -4 ; -#endif FIQ_STACK_START =IRQ_STACK_START -CONFIG_STACKSIZE_IRQ ;return arch_interrupt_init ();
@@ -86,7 +82,6 @@ int disable_interrupts (void) return (old & 0x80) == 0; }#else -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)int interrupt_init (void ) {/*
@@ -96,7 +91,6 @@ int interrupt_init (void)return 0 ; } -#endif void enable_interrupts (void ) {
board/davinci/common/misc.c +0 -10
@@ -33,15 +33,6 @@DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -int dram_init (void ) -{ - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - -return (0 ); -} -#else int dram_init (void ) {/* dram_init must store complete ramsize in gd->ram_size */
@@ -56,7 +47,6 @@ void dram_init_banksize(void) gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; gd->bd->bi_dram[0 ].size = gd->ram_size; } -#endif #ifdef CONFIG_DRIVER_TI_EMAC
board/keymile/km_arm/km_arm.c +0 -15
@@ -225,20 +225,6 @@ U_BOOT_CMD( );#endif -#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) -int dram_init (void ) -{ -int i; - -for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { - gd->bd->bi_dram[i].start =kw_sdram_bar (i); - gd->bd->bi_dram[i].size =get_ram_size ((long *)kw_sdram_bar (i), -kw_sdram_bs (i)); - } - -return 0 ; -} -#else int dram_init (void ) {/* dram_init must store complete ramsize in gd->ram_size */
@@ -259,7 +245,6 @@ void dram_init_banksize(void) kw_sdram_bs(i)); } } -#endif /* Configure and enable MV88E1118 PHY */ void reset_phy (void )
board/ttcontrol/vision2/vision2.c +0 -14
@@ -160,19 +160,8 @@ u32 get_board_rev(void)int dram_init (void ) { -#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =get_ram_size ((long *)PHYS_SDRAM_1 , -PHYS_SDRAM_1_SIZE ); -#if (CONFIG_NR_DRAM_BANKS >1 ) - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =get_ram_size ((long *)PHYS_SDRAM_2 , -PHYS_SDRAM_2_SIZE ); -#endif -#else gd->ram_size =get_ram_size ((long *)PHYS_SDRAM_1 ,PHYS_SDRAM_1_SIZE ); -#endif return 0 ; }
@@ -682,9 +671,6 @@ void lcd_enable(void)int board_init (void ) { -#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC -board_early_init_f (); -#endif gd->bd->bi_arch_number =MACH_TYPE_TTC_VISION2 ;/* board id for linux */ /* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ;
common/cmd_bdinfo.c +0 -2
@@ -343,7 +343,6 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])printf ("ip_addr = %pI4\n" , &bd->bi_ip_addr);#endif printf ("baudrate = %d bps\n" , bd->bi_baudrate); -#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC )#if !(defined(CONFIG_SYS_NO_ICACHE ) && defined(CONFIG_SYS_NO_DCACHE ))print_num ("TLB addr" , gd->tlb_addr);#endif
@@ -352,7 +351,6 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])print_num ("irq_sp" , gd->irq_sp);/* irq stack pointer */ print_num ("sp start " , gd->start_addr_sp);print_num ("FB base " , gd->fb_base); -#endif return 0 ; }
doc/README.arm-relocation +0 -7
@@ -34,17 +34,10 @@ At lib level: Board.c code is adapted from ppc code -At config level: - - Undefine CONFIG_SYS_ARM_WITHOUT_RELOC - * WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING * Boards which are not fixed to support relocation will be REMOVED! -Eventually, CONFIG_SYS_ARM_WITHOUT_RELOC will disappear and boards -which have to migrated to relocation will disappear too. - ----------------------------------------------------------------------------- For boards which boot from nand_spl, it is possible to save one copy
doc/feature-removal-schedule.txt +0 -27
@@ -6,33 +6,6 @@ from U-Boot, its corresponding entry should also be removed from this file. --------------------------- -What: CONFIG_SYS_ARM_WITHOUT_RELOC option -When: After Release 2011.03 - -Why: The implementation of U-Boot for the ARM architecture has - been reworked to support relocation. This allows to - efficiently use the same U-Boot binary image on systems with - different RAM sizes, and brings the implementation much more - in line with the code used for example on Power Architecture - systems (eventually allowing to merge into common code). This - seems especailly interesting now that ARM is getting Device - Tree support as well. - - All ARM boards need to be adapted to this new code, which - requires testing on the actual hardware, so this is a task - for the respective board maintainers or other users. - - Please see the commit message of commit f1d2b31 for details: - - http://git.denx.de/?p=u-boot.git;a=commit;h=f1d2b31 - - Support for CONFIG_SYS_ARM_WITHOUT_RELOC will be removed - after release v2011.03; all boards that have not been - converted by then, i. e. that are still broken then, are - considered unmaintained and without interest for the - community and will be removed as well. - ---------------------------- What: CONFIG_NET_MULTI option When: Release 2009-11
include/configs/imx31_litekit.h +0 -1
@@ -146,7 +146,6 @@#define PHYS_SDRAM_1 CSD0_BASE#define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) -#undef CONFIG_SYS_ARM_WITHOUT_RELOC#define CONFIG_SYS_SDRAM_BASE CSD0_BASE#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
include/configs/jornada.h +0 -1
@@ -28,7 +28,6 @@#define CONFIG_SA1110 1/* This is an SA110 CPU */ #define CONFIG_JORNADA700 1/* on an HP Jornada 700 series */ #define CONFIG_SYS_FLASH_PROTECTION 1 -#define CONFIG_SYS_ARM_WITHOUT_RELOC 1#define CONFIG_SYS_TEXT_BASE 0xC1F00000
include/configs/vision2.h +0 -5
@@ -190,17 +190,12 @@#define CONFIG_SYS_SDRAM_BASE 0x90000000#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000 -#ifndef CONFIG_SYS_ARM_WITHOUT_RELOC #define CONFIG_SYS_INIT_RAM_SIZE (64 * 1024)#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_GBL_DATA_OFFSET)#undef CONFIG_SKIP_RELOCATE_UBOOT -#else -#define CONFIG_SKIP_RELOCATE_UBOOT -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + 0x2000) -#endif #define CONFIG_BOARD_EARLY_INIT_F
nand_spl/nand_boot.c +1 -1
@@ -221,7 +221,7 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs,return 0 ; } -#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) +#if defined(CONFIG_ARM )void board_init_f (ulong bootflag) { relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
nand_spl/nand_boot_fsl_nfc.c +1 -1
@@ -263,7 +263,7 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf)return 0 ; } -#if defined(CONFIG_ARM ) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC ) +#if defined(CONFIG_ARM )void board_init_f (ulong bootflag) { relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL,
Signature · 1 line
1.7.2.3
Wolfgang Denk
AppliedRFC PATCH 2/3 Drop support for CONFIG_SYS_ARM_WITHOUT_RELOC
Quoted 40 lines · In message <[email protected]> you wrote:
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_RELOCdoes 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 <[email protected]>--- arch/arm/config.mk | 5 - arch/arm/cpu/arm1136/start.S | 127 ------------------ arch/arm/cpu/arm1176/start.S | 214 ------------------------------- arch/arm/cpu/arm720t/start.S | 105 --------------- arch/arm/cpu/arm920t/start.S | 144 --------------------- arch/arm/cpu/arm925t/start.S | 121 ----------------- arch/arm/cpu/arm926ejs/orion5x/dram.c | 15 -- arch/arm/cpu/arm926ejs/start.S | 96 -------------- arch/arm/cpu/arm946es/start.S | 85 ------------ arch/arm/cpu/arm_intcm/start.S | 87 ------------- 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 | 113 ---------------- arch/arm/cpu/ixp/start.S | 203 ----------------------------- arch/arm/cpu/lh7a40x/start.S | 113 ---------------- arch/arm/cpu/pxa/start.S | 28 +--- arch/arm/cpu/s3c44b0/start.S | 85 ------------ arch/arm/cpu/sa1100/start.S | 88 ------------- arch/arm/include/asm/global_data.h | 2 - arch/arm/include/asm/u-boot-arm.h | 6 - arch/arm/lib/board.c | 228 --------------------------------- arch/arm/lib/cache-cp15.c | 19 --- arch/arm/lib/interrupts.c | 6 - 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 -
Quoted 8 lines
doc/README.arm-relocation | 7 - doc/feature-removal-schedule.txt | 27 ---- include/configs/imx31_litekit.h | 1 - include/configs/jornada.h | 1 - include/configs/vision2.h | 5 - nand_spl/nand_boot.c | 2 +- nand_spl/nand_boot_fsl_nfc.c | 2 +- 35 files changed, 10 insertions(+), 2023 deletions(-)
Applied.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I'd rather be led to hell than managed to heaven.
RFC PATCH 3/3 Drop support for CONFIG_SKIP_RELOCATE_UBOOT
In reply to Wolfgang DenkFor ARM systems, before ELF relocation was introduced, CONFIG_SKIP_RELOCATE_UBOOT coul be used to prevent *COPYING* the U-Boot image from whereever it was loaded to it's link address (CONFIG_SYS_TEXT_BASE). The name was badly chosen, as no relocation was performed at all, it was just a memcpy().
With ELF relocation, this does not work like that any more, and related boards need to be fixed anyway. So don't keep this relict any longer.
--- Makefile | 1 - README | 18 ++++++++---------- arch/arm/cpu/arm1136/start.S | 4 ---- arch/arm/cpu/arm1176/start.S | 4 ---- arch/arm/cpu/arm720t/start.S | 2 -- arch/arm/cpu/arm920t/start.S | 2 -- arch/arm/cpu/arm925t/start.S | 2 -- arch/arm/cpu/arm926ejs/start.S | 4 ---- arch/arm/cpu/arm946es/start.S | 2 -- arch/arm/cpu/arm_intcm/start.S | 2 -- arch/arm/cpu/armv7/start.S | 4 ---- arch/arm/cpu/ixp/start.S | 2 -- arch/arm/cpu/lh7a40x/start.S | 2 -- arch/arm/cpu/pxa/start.S | 4 ---- arch/arm/cpu/s3c44b0/start.S | 2 -- arch/arm/cpu/sa1100/start.S | 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/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 | 2 -- include/configs/zipitz2.h | 1 - include/configs/zylonite.h | 1 - 61 files changed, 8 insertions(+), 109 deletions(-)
Makefile +0 -1
@@ -1067,7 +1067,6 @@ mx31pdk_nand_config : unconfig echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h; \ else \ echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h; \ - echo "#define CONFIG_SKIP_RELOCATE_UBOOT" >> $(obj)include/config.h; \ fi @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
README +8 -10
@@ -2836,19 +2836,17 @@ Low Level (hardware related) configuration options: globally (CONFIG_CMD_MEM). - CONFIG_SKIP_LOWLEVEL_INIT -- CONFIG_SKIP_RELOCATE_UBOOT + [ARM only] If this variable is defined, then certain + low level initializations (like setting up the memory + controller) are omitted and/or U-Boot does not + relocate itself into RAM. - [ARM only] If these variables are defined, then - certain low level initializations (like setting up - the memory controller) are omitted and/or U-Boot does - not relocate itself into RAM. - Normally these variables MUST NOT be defined. The - only exception is when U-Boot is loaded (to RAM) by - some other boot loader or by a debugger which - performs these initializations itself. + Normally this variable MUST NOT be defined. The only + exception is when U-Boot is loaded (to RAM) by some + other boot loader or by a debugger which performs + these initializations itself. - CONFIG_PRELOADER - Modifies the behaviour of start.S when compiling a loader that is executed before the actual U-Boot. E.g. when compiling a NAND SPL.
arch/arm/cpu/arm1136/start.S +0 -4
@@ -215,7 +215,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -262,7 +261,6 @@ fixnext: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
@@ -295,9 +293,7 @@ jump_2_ram: ldr r0, _board_init_r_ofs adr r1, _start add lr, r0, r1 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT add lr, lr, r9 -#endif /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */
arch/arm/cpu/arm1176/start.S +0 -4
@@ -281,7 +281,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -328,7 +327,6 @@ fixnext: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ #ifdef CONFIG_ENABLE_MMU enable_mmu:
@@ -399,9 +397,7 @@ _nand_boot: .word nand_boot ldr r0, _board_init_r_ofs adr r1, _start add lr, r0, r1 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT add lr, lr, r9 -#endif /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */
arch/arm/cpu/arm720t/start.S +0 -2
@@ -190,7 +190,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -217,7 +216,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/arm920t/start.S +0 -2
@@ -236,7 +236,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -263,7 +262,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/arm925t/start.S +0 -2
@@ -227,7 +227,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -254,7 +253,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/arm926ejs/start.S +0 -4
@@ -204,7 +204,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -251,7 +250,6 @@ fixnext: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
@@ -286,9 +284,7 @@ _nand_boot_ofs: ldr r0, _board_init_r_ofs adr r1, _start add lr, r0, r1 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT add lr, lr, r9 -#endif /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */
arch/arm/cpu/arm946es/start.S +0 -2
@@ -196,7 +196,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -223,7 +222,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/arm_intcm/start.S +0 -2
@@ -194,7 +194,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -221,7 +220,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/armv7/start.S +0 -4
@@ -189,7 +189,6 @@ relocate_code: stack_setup: mov sp, r4 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT adr r0, _start ldr r2, _TEXT_BASE ldr r3, _bss_start_ofs
@@ -259,7 +258,6 @@ clbss_l:str r2, [r0] /* clear loop... */ cmp r0, r1 bne clbss_l #endif /* #ifndef CONFIG_PRELOADER */ -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ /* * We are done. Do not return, instead branch to second part of board
@@ -269,9 +267,7 @@ jump_2_ram: ldr r0, _board_init_r_ofs adr r1, _start add lr, r0, r1 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT add lr, lr, r9 -#endif /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */
arch/arm/cpu/ixp/start.S +0 -2
@@ -320,7 +320,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -347,7 +346,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/lh7a40x/start.S +0 -2
@@ -207,7 +207,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -234,7 +233,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/pxa/start.S +0 -4
@@ -251,7 +251,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT stmfd sp!, {r0-r12} copy_loop: ldmia r0!, {r3-r5, r7-r11} /* copy from source address [r0] */
@@ -300,7 +299,6 @@ fixnext: cmp r2, r3 blo fixloop #endif /* #ifndef CONFIG_PRELOADER */ -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
@@ -332,9 +330,7 @@ _start_oneboot_ofs ldr r0, _board_init_r_ofs adr r1, _start add lr, r0, r1 -#ifndef CONFIG_SKIP_RELOCATE_UBOOT add lr, lr, r9 -#endif /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */
arch/arm/cpu/s3c44b0/start.S +0 -2
@@ -179,7 +179,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -218,7 +217,6 @@ vector_copy_loop: stmia r1!, {r3-r10} cmp r0, r2 blo vector_copy_loop -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
arch/arm/cpu/sa1100/start.S +0 -2
@@ -183,7 +183,6 @@ stack_setup: cmp r0, r6 beq clear_bss -#ifndef CONFIG_SKIP_RELOCATE_UBOOT copy_loop: ldmia r0!, {r9-r10} /* copy from source address [r0] */ stmia r6!, {r9-r10} /* copy to target address [r1] */
@@ -210,7 +209,6 @@ fixloop: cmp r2, r3 blo fixloop #endif -#endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER
include/configs/SMN42.h +0 -1
@@ -31,7 +31,6 @@* so we MUST NOT initialize critical regs like mem-timing ... */ #undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT/* * High Level Configuration Options
include/configs/afeb9260.h +0 -1
@@ -42,7 +42,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/at91cap9adk.h +0 -1
@@ -44,7 +44,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/at91rm9200dk.h +0 -2
@@ -69,8 +69,6 @@#define CONFIG_SYS_SDRC_MR_VAL2 0x00000003/* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000/* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0/* Write refresh rate */ -#else -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /* * Size of malloc() pool
include/configs/at91sam9260ek.h +0 -1
@@ -49,7 +49,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/at91sam9261ek.h +0 -1
@@ -47,7 +47,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/at91sam9263ek.h +0 -1
@@ -43,7 +43,6 @@#ifndef CONFIG_SYS_USE_BOOT_NORFLASH #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /*
include/configs/at91sam9m10g45ek.h +0 -1
@@ -47,7 +47,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/at91sam9rlek.h +0 -1
@@ -44,7 +44,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/cmc_pu2.h +0 -2
@@ -68,8 +68,6 @@#define CONFIG_SYS_SDRC_MR_VAL2 0x00000003/* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000/* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0/* Write refresh rate */ -#else -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /*
include/configs/colibri_pxa270.h +0 -1
@@ -29,7 +29,6 @@#define CONFIG_VPAC270 1/* Toradex Colibri PXA270 board */ #undef BOARD_LATE_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT#undef CONFIG_USE_IRQ#undef CONFIG_SKIP_LOWLEVEL_INIT
include/configs/cpuat91.h +0 -1
@@ -28,7 +28,6 @@#ifdef CONFIG_CPUAT91_RAM #define CONFIG_SKIP_LOWLEVEL_INIT 1 -#define CONFIG_SKIP_RELOCATE_UBOOT 1#else #define CONFIG_BOOTDELAY 1#endif
include/configs/csb637.h +0 -2
@@ -69,8 +69,6 @@#define CONFIG_SYS_SDRC_MR_VAL2 0x00000003/* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000/* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0/* Write refresh rate */ -#else -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /* * Size of malloc() pool
include/configs/da830evm.h +0 -1
@@ -41,7 +41,6 @@#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)#define CONFIG_SYS_HZ 1000#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CONFIG_SYS_TEXT_BASE 0xc1080000/*
include/configs/davinci_dm355evm.h +0 -1
@@ -24,7 +24,6 @@#define DAVINCI_DM355EVM #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_DISPLAY_CPUINFO
include/configs/davinci_dm355leopard.h +0 -1
@@ -23,7 +23,6 @@#define DAVINCI_DM355LEOPARD #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_DISPLAY_CPUINFO
include/configs/davinci_dm365evm.h +0 -1
@@ -24,7 +24,6 @@#define DAVINCI_DM365EVM #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 3rd stage loader */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_NO_FLASH /* that is, no *NOR* flash */ #define CONFIG_SYS_CONSOLE_INFO_QUIET
include/configs/davinci_dm6467evm.h +0 -1
@@ -24,7 +24,6 @@#define DAVINCI_DM6467EVM #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* SoC Configuration */ #define CONFIG_ARM926EJS /* arm926ejs CPU */
include/configs/davinci_dvevm.h +0 -3
@@ -133,7 +133,6 @@#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ #endif #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CONFIG_SYS_NAND_BASE 0x02000000#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_HW_ECC
@@ -143,10 +142,8 @@#elif defined(CONFIG_SYS_USE_NOR )#ifdef CONFIG_NOR_UART_BOOT #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #else #undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT#endif #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_SYS_NO_FLASH
include/configs/davinci_schmoogie.h +0 -1
@@ -88,7 +88,6 @@#define CONFIG_ENV_SECT_SIZE 2048/* Env sector Size */ #define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CONFIG_SYS_NAND_BASE 0x02000000#define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND devices */
include/configs/davinci_sffsdr.h +0 -1
@@ -83,7 +83,6 @@#define CONFIG_ENV_SECT_SIZE 2048/* Env sector Size */ #define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CONFIG_SYS_NAND_BASE 0x02000000#define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND devices */
include/configs/davinci_sonata.h +0 -3
@@ -122,7 +122,6 @@#define CONFIG_ENV_SECT_SIZE 512/* Env sector Size */ #define CONFIG_ENV_SIZE (16 << 10)/* 16 KiB */ #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #define CONFIG_SYS_NAND_BASE 0x02000000#define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND devices */
@@ -131,10 +130,8 @@#elif defined(CONFIG_SYS_USE_NOR )#ifdef CONFIG_NOR_UART_BOOT #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ -#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */ #else #undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT#endif #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_SYS_NO_FLASH
include/configs/dnp1110.h +0 -1
@@ -32,7 +32,6 @@* so we MUST NOT initialize critical regs like mem-timing ... */ #define CONFIG_SKIP_LOWLEVEL_INIT 1 -#undef CONFIG_SKIP_RELOCATE_UBOOT/* * High Level Configuration Options
include/configs/gcplus.h +0 -1
@@ -39,7 +39,6 @@* we use lowlevel_init (!CONFIG_SKIP_LOWLEVEL_INIT) to remedy that problem. */ #undef CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT 1/* * High Level Configuration Options
include/configs/kb9202.h +0 -2
@@ -53,8 +53,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* undef this for direct boot from */ -/* NOR flash without preloader */ #define CONFIG_SYS_LONGHELP
include/configs/lpc2292sodimm.h +0 -1
@@ -31,7 +31,6 @@* so we MUST NOT initialize critical regs like mem-timing ... */ #undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT/* * High Level Configuration Options
include/configs/meesc.h +0 -1
@@ -48,7 +48,6 @@#undef CONFIG_USE_IRQ/* don't need IRQ/FIQ stuff */ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_MISC_INIT_R /* Call misc_init_r */ #define CONFIG_ARCH_CPU_INIT
include/configs/mp2usb.h +0 -2
@@ -73,8 +73,6 @@#define CONFIG_SYS_SDRC_MR_VAL2 0x00000003/* Load Mode Register */ #define CONFIG_SYS_SDRC_MR_VAL3 0x00000000/* Normal Mode */ #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0/* Write refresh rate */ -#else -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /*
include/configs/mx31pdk.h +0 -1
@@ -47,7 +47,6 @@#if defined(CONFIG_NAND_U_BOOT ) && !defined(CONFIG_NAND_SPL )#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT #endif /*
include/configs/mx51evk.h +0 -1
@@ -28,7 +28,6 @@/* High Level Configuration Options */ #define CONFIG_MX51 /* in a mx51 */ -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_SYS_MX5_HCLK 24000000#define CONFIG_SYS_MX5_CLK32 32768
include/configs/netstar.h +0 -3
@@ -119,9 +119,6 @@#define CONFIG_BAUDRATE 115200#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -/*#define CONFIG_SKIP_RELOCATE_UBOOT*/ -/*#define CONFIG_SKIP_LOWLEVEL_INIT */ -/* * Partitions (mtdparts command line support) */
include/configs/otc570.h +0 -1
@@ -48,7 +48,6 @@#undef CONFIG_USE_IRQ/* don't need IRQ/FIQ stuff */ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_MISC_INIT_R 1/* Call misc_init_r */ #define CONFIG_ARCH_CPU_INIT
include/configs/pm9261.h +0 -1
@@ -152,7 +152,6 @@#define CONFIG_INITRD_TAG 1#undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT/* * Hardware drivers
include/configs/pm9263.h +0 -1
@@ -161,7 +161,6 @@#define CONFIG_INITRD_TAG 1#undef CONFIG_SKIP_LOWLEVEL_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT#define CONFIG_USER_LOWLEVEL_INIT 1/*
include/configs/pm9g45.h +0 -1
@@ -47,7 +47,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/pxa255_idp.h +0 -1
@@ -42,7 +42,6 @@* so we MUST NOT initialize critical regs like mem-timing ... */ #undef CONFIG_SKIP_LOWLEVEL_INIT/* define for developing */ -#undef CONFIG_SKIP_RELOCATE_UBOOT/* define for developing */ #define CONFIG_SYS_TEXT_BASE 0x0/*
include/configs/s5p_goni.h +0 -2
@@ -40,8 +40,6 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SKIP_RELOCATE_UBOOT -/* input clock of PLL: has 24MHz input clock@S5PC110 */ #define CONFIG_SYS_CLK_FREQ_C110 24000000
include/configs/sbc35_a9g20.h +0 -1
@@ -54,7 +54,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/shannon.h +0 -1
@@ -34,7 +34,6 @@*/ #define CONFIG_INFERNO /* we are using the inferno bootldr */ #define CONFIG_SKIP_LOWLEVEL_INIT 1 -#undef CONFIG_SKIP_RELOCATE_UBOOT/* * High Level Configuration Options
include/configs/smdk6400.h +0 -2
@@ -40,8 +40,6 @@#define CONFIG_S3C64XX 1/* in a SAMSUNG S3C64XX Family */ #define CONFIG_SMDK6400 1/* on a SAMSUNG SMDK6400 Board */ -#define CONFIG_SKIP_RELOCATE_UBOOT -#define CONFIG_PERIPORT_REMAP #define CONFIG_PERIPORT_BASE 0x70000000#define CONFIG_PERIPORT_SIZE 0x13
include/configs/smdkc100.h +0 -2
@@ -45,8 +45,6 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#undef CONFIG_SKIP_RELOCATE_UBOOT -/* input clock of PLL: SMDKC100 has 12MHz input clock */ #define CONFIG_SYS_CLK_FREQ 12000000
include/configs/tny_a9260.h +0 -1
@@ -63,7 +63,6 @@#define CONFIG_INITRD_TAG 1#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SKIP_RELOCATE_UBOOT /* * Hardware drivers
include/configs/vision2.h +0 -2
@@ -195,8 +195,6 @@ GENERATED_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_GBL_DATA_OFFSET) -#undef CONFIG_SKIP_RELOCATE_UBOOT -#define CONFIG_BOARD_EARLY_INIT_F /* 166 MHz DDR RAM */
include/configs/zipitz2.h +0 -1
@@ -30,7 +30,6 @@#define CONFIG_SYS_TEXT_BASE 0x0#undef BOARD_LATE_INIT -#undef CONFIG_SKIP_RELOCATE_UBOOT#undef CONFIG_USE_IRQ#undef CONFIG_SKIP_LOWLEVEL_INIT
include/configs/zylonite.h +0 -1
@@ -45,7 +45,6 @@#undef CONFIG_MMC#define BOARD_LATE_INIT 1 -#undef CONFIG_SKIP_RELOCATE_UBOOT#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */ /* we will never enable dcache, because we have to setup MMU first */
Signature · 1 line
1.7.2.3
Wolfgang Denk
AppliedRFC PATCH 3/3 Drop support for CONFIG_SKIP_RELOCATE_UBOOT
Quoted 66 lines · In message <[email protected]> you wrote:
For ARM systems, before ELF relocation was introduced,
CONFIG_SKIP_RELOCATE_UBOOTcoul be used to prevent *COPYING* the U-Boot image from whereever it was loaded to it's link address (CONFIG_SYS_TEXT_BASE). The name was badly chosen, as no relocation was performed at all, it was just amemcpy().With ELF relocation, this does not work like that any more, and related boards need to be fixed anyway. So don't keep this relict any longer.
Signed-off-by Wolfgang Denk <[email protected]>--- Makefile | 1 - README | 18 ++++++++---------- arch/arm/cpu/arm1136/start.S | 4 ---- arch/arm/cpu/arm1176/start.S | 4 ---- arch/arm/cpu/arm720t/start.S | 2 -- arch/arm/cpu/arm920t/start.S | 2 -- arch/arm/cpu/arm925t/start.S | 2 -- arch/arm/cpu/arm926ejs/start.S | 4 ---- arch/arm/cpu/arm946es/start.S | 2 -- arch/arm/cpu/arm_intcm/start.S | 2 -- arch/arm/cpu/armv7/start.S | 4 ---- arch/arm/cpu/ixp/start.S | 2 -- arch/arm/cpu/lh7a40x/start.S | 2 -- arch/arm/cpu/pxa/start.S | 4 ---- arch/arm/cpu/s3c44b0/start.S | 2 -- arch/arm/cpu/sa1100/start.S | 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/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 -
Quoted 8 lines
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 | 2 -- include/configs/zipitz2.h | 1 - include/configs/zylonite.h | 1 - 61 files changed, 8 insertions(+), 109 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de It became apparent that one reason why the Ice Giants were known as the Ice Giants was because they were, well, giants. The other was that they were made of ice. -Terry Pratchett, _Sourcery_
cover ARM Relocation Config Cleanup
In reply to Wolfgang DenkDear Wolfgang Denk,
Quoted 2 lines
Wolfgang Denk (3):
ReplaceCONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUP
Seems a slight misnomer to me, and a bit hides what it really does. What about CONFIG_NEEDS_DATA_RELOC_FIXUP ?
Quoted 10 lines
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 ---
Quoted 8 lines
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 -----------
Maybe for a future patch series:
Move all not ARM variant/not SoC specific parts (setting up stack, calling C functions, relocation and relocation fixup) to a common file (arch/arm/lib/generic_start.S), basically leaving only specific parts in the various arch/arm/cpu/*/start.S files. This would highly ease maintenance.
Best Regards,
Reinhard
cover ARM Relocation Config Cleanup
Dear Reinhard Meyer,
Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Wolfgang Denk (3):
ReplaceCONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPSeems a slight misnomer to me, and a bit hides what it really does. What about
CONFIG_NEEDS_DATA_RELOC_FIXUP?
I'm open for suggestions...
Quoted 6 lines
Maybe for a future patch series:
Move all not ARM variant/not SoC specific parts (setting up stack, calling C functions, relocation and relocation fixup) to a common file (
arch/arm/lib/generic_start.S), basically leaving only specific parts in the variousarch/arm/cpu/*/start.Sfiles. This would highly ease maintenance.
Agreed. But that needs to be done by someone who has a clue about ARM; I'm just an old patch-monkey when it comes to that.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The price of curiosity is a terminal experience.
- Terry Pratchett, _The Dark Side of the Sun_cover ARM Relocation Config Cleanup
In reply to Reinhard MeyerHello Reinhard,
Reinhard Meyer wrote:
[...]
Quoted 6 lines
Maybe for a future patch series:
Move all not ARM variant/not SoC specific parts (setting up stack, calling C functions, relocation and relocation fixup) to a common file (
arch/arm/lib/generic_start.S), basically leaving only specific parts in the variousarch/arm/cpu/*/start.Sfiles. This would highly ease maintenance.
Yep, I thought about this too, as I made the relocation stuff, but I decided to think about that in a second step...
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
cover ARM Relocation Config Cleanup
In reply to Reinhard MeyerDear Reinhard Meyer,
Quoted 5 lines · In message <[email protected]> you wrote:
Quoted 2 lines
Replace
CONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPSeems a slight misnomer to me, and a bit hides what it really does. What about
CONFIG_NEEDS_DATA_RELOC_FIXUP?
Thinking about that, I feel the name is too long. And eventually not clear enough either.
How about CONFIG_NEEDS_MANUAL_RELOC ?
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Drawing on my fine command of language, I said nothing.
cover ARM Relocation Config Cleanup
Dear Wolfgang Denk,
Quoted 11 lines
Dear Reinhard Meyer,
Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 1 line
Replace
CONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPSeems a slight misnomer to me, and a bit hides what it really does. What about
CONFIG_NEEDS_DATA_RELOC_FIXUP?Thinking about that, I feel the name is too long. And eventually not clear enough either.
How about
CONFIG_NEEDS_MANUAL_RELOC?
OK, since I had that in mind, too. I skipped it however since "manual" for me smells like really some extra manual labour.
But I guess any full descriptive term would be too long.
Fact is, that that sort of system wide "manual" reloc is needed for "initialized data with pointer contents" only. It would be nice if that fact would peek out to avoid conceptional misunderstandings.
Would it be possible for you to apply those 3 patches to a testing branch, I am having an odd error trying to git-am patch 2/3, however I can find no wrongs in the patch at the complained about places. 1/3 did apply without problems.
Best Regards,
Reinhard
cover ARM Relocation Config Cleanup
Dear Reinhard Meyer,
Quoted 8 lines · In message <[email protected]> you wrote:
Dear Wolfgang Denk,
Quoted 7 lines
Dear Reinhard Meyer,
Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 1 line
Replace
CONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPSeems a slight misnomer to me, and a bit hides what it really does. What about
CONFIG_NEEDS_DATA_RELOC_FIXUP?
Quoted 7 lines
Quoted 4 lines
Thinking about that, I feel the name is too long. And eventually not clear enough either.
How about
CONFIG_NEEDS_MANUAL_RELOC?OK, since I had that in mind, too. I skipped it however since "manual" for me smells like really some extra manual labour.
But I guess any full descriptive term would be too long.
Yes, that's what I think too.
OK, renamed into CONFIG_NEEDS_MANUAL_RELOC.
Quoted 4 lines
Would it be possible for you to apply those 3 patches to a testing branch, I am having an odd error trying to git-am patch 2/3, however I can find no wrongs in the patch at the complained about places. 1/3 did apply without problems.
Done - please see branch "ifdef-cleanup" in the u-boot-testing repo.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Virtue is a relative term. -- Spock, "Friday's Child", stardate 3499.1
cover ARM Relocation Config Cleanup
Le 29/10/2010 12:13, Wolfgang Denk a ?crit :
Quoted 14 lines
Dear Reinhard Meyer,
Quoted 11 lines · In message<[email protected]> you wrote:
Dear Wolfgang Denk,
Quoted 10 lines
Dear Reinhard Meyer,
Quoted 3 lines · In message<[email protected]> you wrote:
Quoted 1 line
Replace
CONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPSeems a slight misnomer to me, and a bit hides what it really does. What about
CONFIG_NEEDS_DATA_RELOC_FIXUP?Thinking about that, I feel the name is too long. And eventually not clear enough either.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
How about
CONFIG_NEEDS_MANUAL_RELOC?OK, since I had that in mind, too. I skipped it however since "manual" for me smells like really some extra manual labour.
But I guess any full descriptive term would be too long.Yes, that's what I think too.
OK, renamed into
CONFIG_NEEDS_MANUAL_RELOC.
Wait... This is the other way around, isn't it? When a board defines CONFIG_RELOC_FIXUP_WORKS, it means "no need to do manual fixups", I think.
Amicalement,
Signature · 1 line
Albert.
cover ARM Relocation Config Cleanup
Le 29/10/2010 13:22, Albert ARIBAUD a ?crit :
Quoted 2 lines
Wait... This is the other way around, isn't it? When a board defines
CONFIG_RELOC_FIXUP_WORKS, it means "no need to do manual fixups", I think.
Scratch this -- I just saw it wasn't just a rename: the tests were inverted, too.
Amicalement,
Signature · 1 line
Albert.
cover ARM Relocation Config Cleanup
In reply to Albert ARIBAUDDear Albert ARIBAUD,
Quoted 5 lines · In message <[email protected]> you wrote:
Quoted 2 lines
OK, renamed into
CONFIG_NEEDS_MANUAL_RELOC.Wait... This is the other way around, isn't it? When a board defines
CONFIG_RELOC_FIXUP_WORKS, it means "no need to do manual fixups", I think.
Yes, that was the case with CONFIG_RELOC_FIXUP_WORKS. but this is what we consider standard today, so we don't define this normally.
Instead, for the few architectures that need it, we define now CONFIG_NEEDS_MANUAL_RELOC.
Of course the logic of the conditions needed to be inverted, i. e. I changed
#if !defined(CONFIG_RELOC_FIXUP_WORKS) into #if defined(CONFIG_NEEDS_MANUAL_RELOC)
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The question of whether a computer can think is no more interesting
than the question of whether a submarine can swim"
- Edsgar W. Dijkstracover ARM Relocation Config Cleanup
In reply to Wolfgang DenkHello Wolfgang,
Quoted 15 lines · Wolfgang Denk
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=87842Given 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, asCONFIG_SYS_ARM_WITHOUT_RELOCdoes not work anyway.
Quoted 4 lines
Wolfgang Denk (3):
ReplaceCONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPDrop support forCONFIG_SYS_ARM_WITHOUT_RELOC
Drop support forCONFIG_SKIP_RELOCATE_UBOOT
Tested this 3 patches on the qong, magnesium, tx25 and omap3_beagle board. Works fine. So:
for all 3 patches.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
cover ARM Relocation Config Cleanup
In reply to Wolfgang DenkQuoted 4 lines · Wolfgang Denk
Wolfgang Denk (3):
ReplaceCONFIG_RELOC_FIXUP_WORKSbyCONFIG_BROKEN_RELOC_FIXUPDrop support forCONFIG_SYS_ARM_WITHOUT_RELOC
Drop support forCONFIG_SKIP_RELOCATE_UBOOT
Tested this 3 patches on the top9000 board (not mainline, at91sam9xe512). Works fine. So:
for all 3 patches.
Reinhard