Skip to content

Commit

Permalink
Refactor linker-generated arrays
Browse files Browse the repository at this point in the history 
Refactor linker-generated array code so that symbols
which were previously linker-generated are now compiler-
generated. This causes relocation records of type
R_ARM_ABS32 to become R_ARM_RELATIVE, which makes
code which uses LGA able to run before relocation as
well as after.

Note: this affects more than ARM targets, as linker-
lists span possibly all target architectures, notably
PowerPC.

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
	arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds
	arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
	board/ait/cam_enc_4xx/u-boot-spl.lds
	board/davinci/da8xxevm/u-boot-spl-da850evm.lds
	board/davinci/da8xxevm/u-boot-spl-hawk.lds
	board/vpac270/u-boot-spl.lds

Signed-off-by: Albert ARIBAUD <[email protected]>
  • Loading branch information
@albert-aribaud-u-boot
albert-aribaud-u-boot committed Mar 12, 2013
1 parent 3ebd1cb commit ef123c5
Show file tree
Hide file tree
Showing 177 changed files with 380 additions and 351 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
/u-boot.dtb
/u-boot.sb
/u-boot.geany
/include/u-boot.lst

#
# Generated files
Expand Down
13 changes: 3 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,8 @@ GEN_UBOOT = \
$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
else
GEN_UBOOT = \
UNDEF_LST=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
sed -n -e 's/.*\($(SYM_PREFIX)_u_boot_list_.*\)/-u\1/p'|sort|uniq`;\
cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
$$UNDEF_LST $(__OBJS) \
$(__OBJS) \
--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
-Map u-boot.map -o u-boot
endif
Expand Down Expand Up @@ -592,11 +590,7 @@ $(SUBDIR_EXAMPLES): $(obj)u-boot
$(LDSCRIPT): depend
$(MAKE) -C $(dir $@) $(notdir $@)

# The following line expands into whole rule which generates u-boot.lst,
# the file containing u-boots LG-array linker section. This is included into
# $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
$(eval $(call make_u_boot_list, $(obj)include/u-boot.lst, $(LIBBOARD) $(LIBS)))
$(obj)u-boot.lds: $(LDSCRIPT) $(obj)include/u-boot.lst
$(obj)u-boot.lds: $(LDSCRIPT)
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@

nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
Expand Down Expand Up @@ -832,7 +826,6 @@ clean:
$(obj)board/matrix_vision/*/bootscript.img \
$(obj)board/voiceblue/eeprom \
$(obj)u-boot.lds \
$(obj)include/u-boot.lst \
$(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] \
$(obj)arch/blackfin/cpu/init.{lds,elf}
@rm -f $(obj)include/bmp_logo.h
Expand Down Expand Up @@ -870,7 +863,7 @@ clobber: tidy
@rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
@rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
@rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map}
@rm -f $(obj)spl/{u-boot-spl.lds,u-boot.lst}
@rm -f $(obj)spl/u-boot-spl.lds
@rm -f $(obj)MLO MLO.byteswap
@rm -f $(obj)SPL
@rm -f $(obj)tools/xway-swap-bytes
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/arm920t/ep93xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ SECTIONS
.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram

.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
} >.sram

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/ixp/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/avr32/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/blackfin/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ SECTIONS


.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
} >ram_data

.text_l1 :
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

.bss ALIGN(0x4):
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/nds32/cpu/n1213/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion arch/nios2/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

/* INIT DATA sections - "Small" data (see the gcc -G option)
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/74xx_7xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc512x/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc5xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SECTIONS
. = .;

.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc5xxx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc8220/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc824x/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc8260/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc83xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ SECTIONS
. = .;

.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SECTIONS
_edata = .;

.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(8);
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc85xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/mpc86xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/cpu/ppc4xx/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/sandbox/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

__u_boot_sandbox_option_start = .;
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/cpu/sh2/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SECTIONS


.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

PROVIDE (reloc_dst_end = .);
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/cpu/sh3/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ SECTIONS


.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

PROVIDE (reloc_dst_end = .);
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/cpu/sh4/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ SECTIONS


.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

PROVIDE (reloc_dst_end = .);
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/cpu/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = ALIGN(4);
Expand Down
2 changes: 1 addition & 1 deletion board/BuS/eb_cpu5282/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion board/LEOX/elpt860/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}

. = .;
Expand Down
2 changes: 1 addition & 1 deletion board/RPXClassic/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RPXClassic/u-boot.lds.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RPXlite/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RPXlite/u-boot.lds.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RPXlite_dw/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RPXlite_dw/u-boot.lds.debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
2 changes: 1 addition & 1 deletion board/RRvision/u-boot.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SECTIONS

. = ALIGN(4);
.u_boot_list : {
#include <u-boot.lst>
KEEP(*(SORT(.u_boot_list*)));
}


Expand Down
Loading

0 comments on commit ef123c5

Please sign in to comment.