LDS unification & initcall
Subsystems (3)
Hi all,
I'm working actually to unify the lds of ARM, SH, and some other arch in order to firstly improve its maintaining and secondly prepare the field to the introduction of the initcall for in a first time post relocation.
Please all Custodian take a look and please try to help on your own area
Best Regards,
J.
PATCH 1/11 mkconfig: export ARCH, CPU, SOC, BOARD, VENDOR to config.h
--- mkconfig | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-)
mkconfig +21 -11
@@ -62,25 +62,35 @@ if [ "$2" = "arm" ] ; then fi # +# Create board specific header file +# +if [ "$APPEND" != "yes" ] # Append to existing config file +then + > config.h # Create new config file +fi + +# # Create include file for Make # echo "ARCH = $2" > config.mk +echo "#define CONFIG_ARCH $2" >> config.h echo "CPU = $3" >> config.mk +echo "#define CONFIG_CPU $3" >> config.h echo "BOARD = $4" >> config.mk +echo "#define CONFIG_BOARD $4" >> config.h -[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk +[ "$5" ] && [ "$5" != "NULL" ] && { + echo "VENDOR = $5" >> config.mk + echo "#define CONFIG_VENDOR $5" >> config.h +} -[ "$6" ] && [ "$6" != "NULL" ] && echo "SOC = $6" >> config.mk -# -# Create board specific header file -# -if [ "$APPEND" = "yes" ] # Append to existing config file -then - echo >> config.h -else - > config.h # Create new config file -fi +[ "$6" ] && [ "$6" != "NULL" ] && { + echo "SOC = $6" >> config.mk; + echo "#define CONFIG_SOC $6" >> config.h; +} + +echo >> config.h echo "/* Automatically generated - do not edit */" >>config.h echo "#include <configs/$1.h>" >>config.h echo "#include <asm/config.h>" >>config.h
Signature · 1 line
1.5.6.5
PATCH 2/11 arm: unified u-boot.lds
--- .gitignore | 1 + Makefile | 1 - arm_config.mk | 1 + board/actux1/config.mk | 1 + board/actux2/config.mk | 1 + board/actux3/config.mk | 1 + board/actux4/u-boot.lds | 66 ---------------------- board/apollon/u-boot.lds | 63 --------------------- board/armadillo/u-boot.lds | 55 ------------------ board/armltd/integratorap/split_by_variant.sh | 4 - board/armltd/integratorap/u-boot.lds.template | 53 ----------------- board/armltd/integratorcp/split_by_variant.sh | 4 - board/armltd/integratorcp/u-boot.lds.template | 53 ----------------- board/armltd/versatile/u-boot.lds | 51 ----------------- board/assabet/u-boot.lds | 58 ------------------- board/atmel/at91rm9200dk/u-boot.lds | 57 ------------------- board/cerf250/u-boot.lds | 56 ------------------ board/cm4008/u-boot.lds | 56 ------------------ board/cm41xx/u-boot.lds | 56 ------------------ board/cradle/u-boot.lds | 56 ------------------ board/csb226/u-boot.lds | 56 ------------------ board/csb637/u-boot.lds | 56 ------------------ board/dave/B2/u-boot.lds | 58 ------------------- board/davinci/dvevm/u-boot.lds | 52 ----------------- board/davinci/schmoogie/u-boot.lds | 52 ----------------- board/davinci/sffsdr/u-boot.lds | 52 ----------------- board/davinci/sonata/u-boot.lds | 52 ----------------- board/delta/u-boot.lds | 56 ------------------ board/dnp1110/u-boot.lds | 56 ------------------ board/ep7312/u-boot.lds | 56 ------------------ board/evb4510/config.mk | 1 + board/freescale/mx31ads/config.mk | 1 + board/gcplus/u-boot.lds | 58 ------------------- board/impa7/u-boot.lds | 56 ------------------ board/imx31_litekit/u-boot.lds | 59 ------------------- board/imx31_phycore/u-boot.lds | 59 ------------------- board/innokom/u-boot.lds | 56 ------------------ board/ixdp425/u-boot.lds | 56 ------------------ board/kb9202/u-boot.lds | 56 ------------------ board/lart/u-boot.lds | 56 ------------------ board/logodl/u-boot.lds | 56 ------------------ board/lpc2292sodimm/u-boot.lds | 55 ------------------ board/lpd7a40x/u-boot.lds | 57 ------------------- board/lubbock/u-boot.lds | 56 ------------------ board/m501sk/u-boot.lds | 55 ------------------ board/modnet50/config.mk | 1 + board/mp2usb/u-boot.lds | 56 ------------------ board/mpl/vcma9/u-boot.lds | 57 ------------------- board/mx1ads/u-boot.lds | 58 ------------------- board/mx1fs2/u-boot.lds | 57 ------------------- board/netstar/u-boot.lds | 55 ------------------ board/ns9750dev/u-boot.lds | 59 ------------------- board/omap1510inn/u-boot.lds | 57 ------------------- board/omap1610inn/u-boot.lds | 52 ----------------- board/omap2420h4/u-boot.lds | 59 ------------------- board/omap3/beagle/u-boot.lds | 63 --------------------- board/omap3/evm/u-boot.lds | 63 --------------------- board/omap3/overo/u-boot.lds | 63 --------------------- board/omap3/pandora/u-boot.lds | 63 --------------------- board/omap3/zoom1/u-boot.lds | 63 --------------------- board/omap5912osk/u-boot.lds | 52 ----------------- board/omap730p2/u-boot.lds | 52 ----------------- board/pleb2/u-boot.lds | 56 ------------------ board/prodrive/pdnb3/u-boot.lds | 56 ------------------ board/pxa255_idp/u-boot.lds | 56 ------------------ board/samsung/smdk2400/u-boot.lds | 57 ------------------- board/samsung/smdk2410/u-boot.lds | 57 ------------------- board/sbc2410x/u-boot.lds | 56 ------------------ board/scb9328/u-boot.lds | 57 ------------------- board/shannon/u-boot.lds | 56 ------------------ board/siemens/SMN42/u-boot.lds | 55 ------------------ board/st/nmdk8815/u-boot.lds | 51 ----------------- board/sx1/u-boot.lds | 57 ------------------- board/trab/config.mk | 1 + board/trizepsiv/u-boot.lds | 56 ------------------ board/voiceblue/u-boot.lds | 56 ------------------ board/wepep250/u-boot.lds | 56 ------------------ board/xaeniax/u-boot.lds | 56 ------------------ board/xm250/u-boot.lds | 56 ------------------ board/xsengine/u-boot.lds | 56 ------------------ board/zylonite/u-boot.lds | 56 ------------------ cpu/arm926ejs/at91/config.mk | 1 - cpu/arm926ejs/at91/u-boot.lds | 57 ------------------- lib_arm/Makefile | 5 +- board/cmc_pu2/u-boot.lds => lib_arm/u-boot.lds.S | 14 +++- 85 files changed, 23 insertions(+), 3968 deletions(-) delete mode 100644 board/actux4/u-boot.lds delete mode 100644 board/apollon/u-boot.lds delete mode 100644 board/armadillo/u-boot.lds delete mode 100644 board/armltd/integratorap/u-boot.lds.template delete mode 100644 board/armltd/integratorcp/u-boot.lds.template delete mode 100644 board/armltd/versatile/u-boot.lds delete mode 100644 board/assabet/u-boot.lds delete mode 100644 board/atmel/at91rm9200dk/u-boot.lds delete mode 100644 board/cerf250/u-boot.lds delete mode 100644 board/cm4008/u-boot.lds delete mode 100644 board/cm41xx/u-boot.lds delete mode 100644 board/cradle/u-boot.lds delete mode 100644 board/csb226/u-boot.lds delete mode 100644 board/csb637/u-boot.lds delete mode 100644 board/dave/B2/u-boot.lds delete mode 100644 board/davinci/dvevm/u-boot.lds delete mode 100644 board/davinci/schmoogie/u-boot.lds delete mode 100644 board/davinci/sffsdr/u-boot.lds delete mode 100644 board/davinci/sonata/u-boot.lds delete mode 100644 board/delta/u-boot.lds delete mode 100644 board/dnp1110/u-boot.lds delete mode 100644 board/ep7312/u-boot.lds delete mode 100644 board/gcplus/u-boot.lds delete mode 100644 board/impa7/u-boot.lds delete mode 100644 board/imx31_litekit/u-boot.lds delete mode 100644 board/imx31_phycore/u-boot.lds delete mode 100644 board/innokom/u-boot.lds delete mode 100644 board/ixdp425/u-boot.lds delete mode 100644 board/kb9202/u-boot.lds delete mode 100644 board/lart/u-boot.lds delete mode 100644 board/logodl/u-boot.lds delete mode 100644 board/lpc2292sodimm/u-boot.lds delete mode 100644 board/lpd7a40x/u-boot.lds delete mode 100644 board/lubbock/u-boot.lds delete mode 100644 board/m501sk/u-boot.lds delete mode 100644 board/mp2usb/u-boot.lds delete mode 100644 board/mpl/vcma9/u-boot.lds delete mode 100644 board/mx1ads/u-boot.lds delete mode 100644 board/mx1fs2/u-boot.lds delete mode 100644 board/netstar/u-boot.lds delete mode 100644 board/ns9750dev/u-boot.lds delete mode 100644 board/omap1510inn/u-boot.lds delete mode 100644 board/omap1610inn/u-boot.lds delete mode 100644 board/omap2420h4/u-boot.lds delete mode 100644 board/omap3/beagle/u-boot.lds delete mode 100644 board/omap3/evm/u-boot.lds delete mode 100644 board/omap3/overo/u-boot.lds delete mode 100644 board/omap3/pandora/u-boot.lds delete mode 100644 board/omap3/zoom1/u-boot.lds delete mode 100644 board/omap5912osk/u-boot.lds delete mode 100644 board/omap730p2/u-boot.lds delete mode 100644 board/pleb2/u-boot.lds delete mode 100644 board/prodrive/pdnb3/u-boot.lds delete mode 100644 board/pxa255_idp/u-boot.lds delete mode 100644 board/samsung/smdk2400/u-boot.lds delete mode 100644 board/samsung/smdk2410/u-boot.lds delete mode 100644 board/sbc2410x/u-boot.lds delete mode 100644 board/scb9328/u-boot.lds delete mode 100644 board/shannon/u-boot.lds delete mode 100644 board/siemens/SMN42/u-boot.lds delete mode 100644 board/st/nmdk8815/u-boot.lds delete mode 100644 board/sx1/u-boot.lds delete mode 100644 board/trizepsiv/u-boot.lds delete mode 100644 board/voiceblue/u-boot.lds delete mode 100644 board/wepep250/u-boot.lds delete mode 100644 board/xaeniax/u-boot.lds delete mode 100644 board/xm250/u-boot.lds delete mode 100644 board/xsengine/u-boot.lds delete mode 100644 board/zylonite/u-boot.lds delete mode 100644 cpu/arm926ejs/at91/u-boot.lds rename board/cmc_pu2/u-boot.lds => lib_arm/u-boot.lds.S (88%)
.gitignore +1 -0
@@ -38,6 +38,7 @@ /LOG /errlog /reloc_off +/lib_*/u-boot.lds # stgit generated dirs patches-*
Makefile +0 -1
@@ -3457,7 +3457,6 @@ clean: @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ - $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h
arm_config.mk +1 -0
@@ -22,3 +22,4 @@ # PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
board/actux1/config.mk +1 -0
@@ -2,3 +2,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/actux2/config.mk +1 -0
@@ -2,3 +2,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/actux3/config.mk +1 -0
@@ -2,3 +2,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/actux4/u-boot.lds deleted +0 -66
66 lines not on this page · raw message
board/apollon/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/armadillo/u-boot.lds deleted +0 -55
55 lines not on this page · raw message
board/armltd/integratorap/split_by_variant.sh +0 -4
@@ -108,10 +108,6 @@ mkdir -p ${obj}include mkdir -p ${obj}board/armltd/integratorap mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- -# Ensure correct core object loaded first in U-Boot image -# --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorap/u-boot.lds.template > ${obj}board/armltd/integratorap/u-boot.lds -# --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- $MKCONFIG -a integratorap arm $cpu integratorap armltd;
board/armltd/integratorap/u-boot.lds.template deleted +0 -53
53 lines not on this page · raw message
board/armltd/integratorcp/split_by_variant.sh +0 -4
@@ -103,10 +103,6 @@ mkdir -p ${obj}include mkdir -p ${obj}board/armltd/integratorcp mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- -# Ensure correct core object loaded first in U-Boot image -# --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/armltd/integratorcp/u-boot.lds.template > ${obj}board/armltd/integratorcp/u-boot.lds -# --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- $MKCONFIG -a integratorcp arm $cpu integratorcp armltd;
board/armltd/integratorcp/u-boot.lds.template deleted +0 -53
53 lines not on this page · raw message
board/armltd/versatile/u-boot.lds deleted +0 -51
51 lines not on this page · raw message
board/assabet/u-boot.lds deleted +0 -58
58 lines not on this page · raw message
board/atmel/at91rm9200dk/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/cerf250/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/cm4008/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/cm41xx/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/cradle/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/csb226/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/csb637/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/dave/B2/u-boot.lds deleted +0 -58
58 lines not on this page · raw message
board/davinci/dvevm/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/davinci/schmoogie/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/davinci/sffsdr/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/davinci/sonata/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/delta/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/dnp1110/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/ep7312/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/evb4510/config.mk +1 -0
@@ -25,3 +25,4 @@ # TEXT_BASE = 0x007d0000 +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/freescale/mx31ads/config.mk +1 -0
@@ -1 +1,2 @@ TEXT_BASE = 0x87f00000 +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/gcplus/u-boot.lds deleted +0 -58
58 lines not on this page · raw message
board/impa7/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/imx31_litekit/u-boot.lds deleted +0 -59
59 lines not on this page · raw message
board/imx31_phycore/u-boot.lds deleted +0 -59
59 lines not on this page · raw message
board/innokom/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/ixdp425/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/kb9202/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/lart/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/logodl/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/lpc2292sodimm/u-boot.lds deleted +0 -55
55 lines not on this page · raw message
board/lpd7a40x/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/lubbock/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/m501sk/u-boot.lds deleted +0 -55
55 lines not on this page · raw message
board/modnet50/config.mk +1 -0
@@ -27,3 +27,4 @@ TEXT_BASE = 0x00f00000 #CROSS_COMPILE = arm-elf- +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/mp2usb/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/mpl/vcma9/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/mx1ads/u-boot.lds deleted +0 -58
58 lines not on this page · raw message
board/mx1fs2/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/netstar/u-boot.lds deleted +0 -55
55 lines not on this page · raw message
board/ns9750dev/u-boot.lds deleted +0 -59
59 lines not on this page · raw message
board/omap1510inn/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/omap1610inn/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/omap2420h4/u-boot.lds deleted +0 -59
59 lines not on this page · raw message
board/omap3/beagle/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/evm/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/overo/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/pandora/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/zoom1/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap5912osk/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/omap730p2/u-boot.lds deleted +0 -52
52 lines not on this page · raw message
board/pleb2/u-boot.lds deleted +0 -56
50 lines not on this page · raw message
board/prodrive/pdnb3/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/pxa255_idp/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/samsung/smdk2400/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/samsung/smdk2410/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/sbc2410x/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/scb9328/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/shannon/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/siemens/SMN42/u-boot.lds deleted +0 -55
55 lines not on this page · raw message
board/st/nmdk8815/u-boot.lds deleted +0 -51
51 lines not on this page · raw message
board/sx1/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
board/trizepsiv/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/voiceblue/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/wepep250/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/xaeniax/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/xm250/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/xsengine/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
board/zylonite/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
cpu/arm926ejs/at91/u-boot.lds deleted +0 -57
57 lines not on this page · raw message
lib_arm/u-boot.lds.S renamed from board/cmc_pu2/u-boot.lds +10 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.6.5
Part of the diff is not shown here. View the raw message.
PATCH 3/11 ARM: LDS remove the OUTPUT_FORMAT
--- board/actux1/u-boot.lds | 1 - board/actux2/u-boot.lds | 1 - board/actux3/u-boot.lds | 1 - board/evb4510/u-boot.lds | 1 - board/freescale/mx31ads/u-boot.lds | 1 - board/modnet50/u-boot.lds | 1 - board/samsung/smdk6400/u-boot-nand.lds | 1 - board/trab/u-boot.lds | 2 -- cpu/ixp/config.mk | 1 + lib_arm/u-boot.lds.S | 5 ----- nand_spl/board/samsung/smdk6400/u-boot.lds | 1 - onenand_ipl/board/apollon/u-boot.onenand.lds | 1 - 12 files changed, 1 insertions(+), 16 deletions(-)
board/actux1/u-boot.lds +0 -1
@@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") OUTPUT_ARCH (arm) ENTRY (_start) SECTIONS
board/actux2/u-boot.lds +0 -1
@@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") OUTPUT_ARCH (arm) ENTRY (_start) SECTIONS
board/actux3/u-boot.lds +0 -1
@@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") OUTPUT_ARCH (arm) ENTRY (_start) SECTIONS
board/evb4510/u-boot.lds +0 -1
@@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
board/freescale/mx31ads/u-boot.lds +0 -1
@@ -24,7 +24,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
board/modnet50/u-boot.lds +0 -1
@@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
board/samsung/smdk6400/u-boot-nand.lds +0 -1
@@ -24,7 +24,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
board/trab/u-boot.lds +0 -2
@@ -21,8 +21,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
cpu/ixp/config.mk +1 -0
@@ -28,6 +28,7 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -msoft-float -mbig-endian PLATFORM_CPPFLAGS += -mbig-endian -march=armv5te -mtune=strongarm1100 +PLATFORM_LDFLAGS += -EB # ========================================================================= # # Supply options according to compiler version
lib_arm/u-boot.lds.S +0 -5
@@ -23,11 +23,6 @@ #include <config.h> -#ifdef __ARMEB__ -OUTPUT_FORMAT("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") -#else -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -#endif OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
nand_spl/board/samsung/smdk6400/u-boot.lds +0 -1
@@ -24,7 +24,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
onenand_ipl/board/apollon/u-boot.onenand.lds +0 -1
@@ -23,7 +23,6 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS
Signature · 1 line
1.5.6.5
PATCH 4/11 sh: unified u-boot.lds
--- board/mpr2/u-boot.lds | 109 -------------------- board/ms7720se/u-boot.lds | 108 ------------------- board/ms7722se/u-boot.lds | 105 ------------------- board/ms7750se/u-boot.lds | 105 ------------------- board/renesas/MigoR/u-boot.lds | 105 ------------------- board/renesas/ap325rxa/u-boot.lds | 105 ------------------- board/renesas/r2dplus/u-boot.lds | 105 ------------------- board/renesas/r7780mp/u-boot.lds | 105 ------------------- board/renesas/rsk7203/u-boot.lds | 101 ------------------ board/renesas/sh7763rdp/u-boot.lds | 105 ------------------- lib_sh/Makefile | 5 +- .../sh7785lcr/u-boot.lds => lib_sh/u-boot.lds.S | 12 +- sh_config.mk | 1 + 13 files changed, 11 insertions(+), 1060 deletions(-) delete mode 100644 board/mpr2/u-boot.lds delete mode 100644 board/ms7720se/u-boot.lds delete mode 100644 board/ms7722se/u-boot.lds delete mode 100644 board/ms7750se/u-boot.lds delete mode 100644 board/renesas/MigoR/u-boot.lds delete mode 100644 board/renesas/ap325rxa/u-boot.lds delete mode 100644 board/renesas/r2dplus/u-boot.lds delete mode 100644 board/renesas/r7780mp/u-boot.lds delete mode 100644 board/renesas/rsk7203/u-boot.lds delete mode 100644 board/renesas/sh7763rdp/u-boot.lds rename board/renesas/sh7785lcr/u-boot.lds => lib_sh/u-boot.lds.S (89%)
board/mpr2/u-boot.lds deleted +0 -109
@@ -1,109 +0,0 @@ -/* - * Copyright (C) 2007 - * Yoshihiro Shimoda <[email protected]> - * - * Copyright (C) 2007 - * Nobuhiro Iwamatsu <[email protected]> - * - * Copyright (C) 2008 - * Mark Jonas <[email protected]> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux") -OUTPUT_ARCH(sh) -ENTRY(_start) - -SECTIONS -{ - /* - Base address of internal SDRAM is 0x8C000000. - U-Boot resides in the last 256 kB of the 64 MB. - - NOTE: This address must match with the definition of - TEXT_BASE in config.mk (in this directory). - - */ - . = 0x8C000000 + (64*1024*1024) - (256*1024); - - PROVIDE (reloc_dst = .); - - PROVIDE (_ftext = .); - PROVIDE (_fcode = .); - PROVIDE (_start = .); - - .text : - { - cpu/sh3/start.o (.text) - . = ALIGN(8192); - common/env_embedded.o (.ppcenv) - . = ALIGN(8192); - common/env_embedded.o (.ppcenvr) - . = ALIGN(8192); - *(.text) - . = ALIGN(4); - } =0xFF - PROVIDE (_ecode = .); - .rodata : - { - *(.rodata) - . = ALIGN(4); - } - PROVIDE (_etext = .); - - - PROVIDE (_fdata = .); - .data : - { - *(.data) - . = ALIGN(4); - } - PROVIDE (_edata = .); - - PROVIDE (_fgot = .); - .got : - { - *(.got) - . = ALIGN(4); - } - PROVIDE (_egot = .); - - PROVIDE (__u_boot_cmd_start = .); - .u_boot_cmd : - { - *(.u_boot_cmd) - . = ALIGN(4); - } - PROVIDE (__u_boot_cmd_end = .); - - PROVIDE (reloc_dst_end = .); - /* _reloc_dst_end = .; */ - - PROVIDE (bss_start = .); - PROVIDE (__bss_start = .); - .bss : - { - *(.bss) - . = ALIGN(4); - } - PROVIDE (bss_end = .); - - PROVIDE (_end = .); -}
board/ms7720se/u-boot.lds deleted +0 -108
108 lines not on this page · raw message
board/ms7722se/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/ms7750se/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/renesas/MigoR/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/renesas/ap325rxa/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/renesas/r2dplus/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/renesas/r7780mp/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
board/renesas/rsk7203/u-boot.lds deleted +0 -101
101 lines not on this page · raw message
board/renesas/sh7763rdp/u-boot.lds deleted +0 -105
105 lines not on this page · raw message
lib_sh/Makefile +4 -1
@@ -35,9 +35,12 @@ endif SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_sh/u-boot.lds.S renamed from board/renesas/sh7785lcr/u-boot.lds +6 -6
@@ -1,7 +1,6 @@ /* - * Copyrigth (c) 2007 + * Copyrigth (c) 2007,2008 * Nobuhiro Iwamatsu <[email protected]> - * Copyrigth (c) 2008 Yoshihiro Shimoda <[email protected]> * * See file CREDITS for list of people who contributed to this * project.
@@ -22,13 +21,15 @@ * MA 02111-1307 USA */ +#include <config.h> + OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux") OUTPUT_ARCH(sh) ENTRY(_start) SECTIONS { - . = 0x08000000 + (128 * 1024 * 1024) - (512 * 1024); + . = TEXT_BASE; PROVIDE (reloc_dst = .);
@@ -38,7 +39,7 @@ SECTIONS .text : { - cpu/sh4/start.o (.text) + cpu/CONFIG_CPU/start.o (.text) . = ALIGN(8192); common/env_embedded.o (.ppcenv) . = ALIGN(8192);
@@ -81,11 +82,10 @@ SECTIONS PROVIDE (__u_boot_cmd_end = .); PROVIDE (reloc_dst_end = .); - /* _reloc_dst_end = .; */ PROVIDE (bss_start = .); PROVIDE (__bss_start = .); - .bss : + .bss (NOLOAD) : { *(.bss) . = ALIGN(4);
sh_config.mk +1 -0
@@ -22,3 +22,4 @@ # PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
Signature · 1 line
1.5.6.5
PATCH 5/11 sh: LDS remove the OUTPUT_FORMAT
--- lib_sh/u-boot.lds.S | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
lib_sh/u-boot.lds.S +0 -1
@@ -23,7 +23,6 @@ #include <config.h> -OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux") OUTPUT_ARCH(sh) ENTRY(_start)
Signature · 1 line
1.5.6.5
PATCH 6/11 actuax/B2: fix coding style
--- board/actux1/u-boot.lds | 62 +++++++++++++++++++++------------------------- board/actux2/u-boot.lds | 59 +++++++++++++++++++------------------------- board/actux3/u-boot.lds | 59 +++++++++++++++++++------------------------- 3 files changed, 78 insertions(+), 102 deletions(-)
board/actux1/u-boot.lds +28 -34
@@ -27,43 +27,37 @@ SECTIONS { . = 0x00000000; - . = ALIGN (4); - .text : { - cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) - common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + . = ALIGN(4); + .text : + { + cpu/ixp/start.o (.text) + lib_generic/string.o (.text) + lib_generic/vsprintf.o (.text) + lib_arm/board.o (.text) + common/dlmalloc.o (.text) + cpu/ixp/cpu.o (.text) . = env_offset; - common/env_embedded.o(.ppcenv) + common/env_embedded.o (.ppcenv) * (.text) } - . = ALIGN (4); - .rodata : { - *(.rodata) - } - . = ALIGN (4); - .data : { - *(.data) - } - . = ALIGN (4); - .got : { - *(.got) - } - . =.; - __u_boot_cmd_start =.; - .u_boot_cmd : { - *(.u_boot_cmd) - } - __u_boot_cmd_end =.; + . = ALIGN(4); + .rodata : { *(.rodata) } - . = ALIGN (4); - __bss_start =.; - .bss (NOLOAD): { - *(.bss) - . = ALIGN(4); - } - _end =.; + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + . = .; + + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } + _end = .; }
board/actux2/u-boot.lds +25 -34
73 lines not on this page · raw message
board/actux3/u-boot.lds +25 -34
73 lines not on this page · raw message
Signature · 1 line
1.5.6.5
PATCH 7/11 avr32: unified u-boot.lds
--- avr32_config.mk | 1 + board/atmel/atngw100/u-boot.lds | 73 -------------------- board/earthlcd/favr-32-ezkit/u-boot.lds | 71 ------------------- board/mimc/mimc200/u-boot.lds | 73 -------------------- board/miromico/hammerhead/u-boot.lds | 73 -------------------- lib_avr32/Makefile | 5 +- .../atstk1000/u-boot.lds => lib_avr32/u-boot.lds.S | 3 + 7 files changed, 8 insertions(+), 291 deletions(-) delete mode 100644 board/atmel/atngw100/u-boot.lds delete mode 100644 board/earthlcd/favr-32-ezkit/u-boot.lds delete mode 100644 board/mimc/mimc200/u-boot.lds delete mode 100644 board/miromico/hammerhead/u-boot.lds rename board/atmel/atstk1000/u-boot.lds => lib_avr32/u-boot.lds.S (98%)
avr32_config.mk +1 -0
@@ -23,3 +23,4 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_LDFLAGS += --relax +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
board/atmel/atngw100/u-boot.lds deleted +0 -73
73 lines not on this page · raw message
board/earthlcd/favr-32-ezkit/u-boot.lds deleted +0 -71
71 lines not on this page · raw message
board/mimc/mimc200/u-boot.lds deleted +0 -73
73 lines not on this page · raw message
board/miromico/hammerhead/u-boot.lds deleted +0 -73
73 lines not on this page · raw message
lib_avr32/Makefile +4 -1
@@ -36,9 +36,12 @@ COBJS-y += interrupts.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_avr32/u-boot.lds.S renamed from board/atmel/atstk1000/u-boot.lds +3 -0
@@ -20,6 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ + +#include <config.h> + OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") OUTPUT_ARCH(avr32) ENTRY(_start)
Signature · 1 line
1.5.6.5
PATCH 8/11 mips: unified u-boot.lds
--- board/dbau1x00/u-boot.lds | 70 ------------------- board/gth2/u-boot.lds | 70 ------------------- board/incaip/u-boot.lds | 70 ------------------- board/pb1x00/u-boot.lds | 70 ------------------- board/purple/config.mk | 1 + board/qemu-mips/u-boot.lds | 72 -------------------- board/tb0229/u-boot.lds | 70 ------------------- lib_mips/Makefile | 5 +- .../vct/u-boot.lds => lib_mips/u-boot.lds.S | 32 +++++---- mips_config.mk | 1 + 10 files changed, 23 insertions(+), 438 deletions(-) delete mode 100644 board/dbau1x00/u-boot.lds delete mode 100644 board/gth2/u-boot.lds delete mode 100644 board/incaip/u-boot.lds delete mode 100644 board/pb1x00/u-boot.lds delete mode 100644 board/qemu-mips/u-boot.lds delete mode 100644 board/tb0229/u-boot.lds rename board/micronas/vct/u-boot.lds => lib_mips/u-boot.lds.S (79%)
board/dbau1x00/u-boot.lds deleted +0 -70
@@ -1,70 +0,0 @@ -/* - * (C) Copyright 2003 - * Wolfgang Denk Engineering, <[email protected]> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* -OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips") -*/ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradbigmips") -OUTPUT_ARCH(mips) -ENTRY(_start) -SECTIONS -{ - . = 0x00000000; - - . = ALIGN(4); - .text : - { - *(.text) - } - - . = ALIGN(4); - .rodata : { *(.rodata) } - - . = ALIGN(4); - .data : { *(.data) } - - . = .; - _gp = ALIGN(16) + 0x7ff0; - - .got : { - __got_start = .; - *(.got) - __got_end = .; - } - - .sdata : { *(.sdata) } - - .u_boot_cmd : { - __u_boot_cmd_start = .; - *(.u_boot_cmd) - __u_boot_cmd_end = .; - } - - uboot_end_data = .; - num_got_entries = (__got_end - __got_start) >> 2; - - . = ALIGN(4); - .sbss (NOLOAD) : { *(.sbss) } - .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - uboot_end = .; -}
board/gth2/u-boot.lds deleted +0 -70
70 lines not on this page · raw message
board/incaip/u-boot.lds deleted +0 -70
70 lines not on this page · raw message
board/pb1x00/u-boot.lds deleted +0 -70
70 lines not on this page · raw message
board/purple/config.mk +1 -0
@@ -30,3 +30,4 @@ TEXT_BASE = 0xB0000000 # RAM version #TEXT_BASE = 0x80100000 +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
board/qemu-mips/u-boot.lds deleted +0 -72
72 lines not on this page · raw message
board/tb0229/u-boot.lds deleted +0 -70
70 lines not on this page · raw message
lib_mips/Makefile +4 -1
@@ -38,9 +38,12 @@ COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_mips/u-boot.lds.S renamed from board/micronas/vct/u-boot.lds +17 -15
@@ -1,5 +1,5 @@ /* - * (C) Copyright 2003 + * (C) Copyright 2003-2005 * Wolfgang Denk Engineering, <[email protected]> * * See file CREDITS for list of people who contributed to this
@@ -21,7 +21,9 @@ * MA 02111-1307 USA */ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips") +#include <config.h> + +OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradbigmips") OUTPUT_ARCH(mips) ENTRY(_start) SECTIONS
@@ -29,34 +31,34 @@ SECTIONS . = 0x00000000; . = ALIGN(4); - .text : + .text : { - *(.text) + *(.text) } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { *(.rodata) } . = ALIGN(4); - .data : { *(.data) } + .data : { *(.data) } . = .; _gp = ALIGN(16) + 0x7ff0; .got : { - __got_start = .; - *(.got) - __got_end = .; + __got_start = .; + *(.got) + __got_end = .; } . = ALIGN(4); - .sdata : { *(.sdata) } + .sdata : { *(.sdata) } . = ALIGN(4); .u_boot_cmd : { - __u_boot_cmd_start = .; - *(.u_boot_cmd) - __u_boot_cmd_end = .; + __u_boot_cmd_start = .; + *(.u_boot_cmd) + __u_boot_cmd_end = .; } . = ALIGN(4);
@@ -64,8 +66,8 @@ SECTIONS num_got_entries = (__got_end - __got_start) >> 2; . = ALIGN(4); - .sbss (NOLOAD) : { *(.sbss) } + .sbss (NOLOAD) : { *(.sbss) } . = ALIGN(4); - .bss (NOLOAD) : { *(.bss) } + .bss (NOLOAD) : { *(.bss) } uboot_end = .; }
mips_config.mk +1 -0
@@ -46,3 +46,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ PLATFORM_CPPFLAGS += -G 0 -mabicalls -fpic PLATFORM_CPPFLAGS += -msoft-float PLATFORM_LDFLAGS += -G 0 -static -n -nostdlib +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
Signature · 1 line
1.5.6.5
PATCH 9/11 nios2: unified u-boot.lds
--- board/altera/ep1c20/u-boot.lds | 136 ------------------- board/altera/ep1s10/u-boot.lds | 136 ------------------- board/altera/ep1s40/u-boot.lds | 136 ------------------- board/psyent/pci5441/u-boot.lds | 137 -------------------- lib_nios2/Makefile | 5 +- .../pk1c20/u-boot.lds => lib_nios2/u-boot.lds.S | 47 ++++---- nios2_config.mk | 1 + 7 files changed, 29 insertions(+), 569 deletions(-) delete mode 100644 board/altera/ep1c20/u-boot.lds delete mode 100644 board/altera/ep1s10/u-boot.lds delete mode 100644 board/altera/ep1s40/u-boot.lds delete mode 100644 board/psyent/pci5441/u-boot.lds rename board/psyent/pk1c20/u-boot.lds => lib_nios2/u-boot.lds.S (88%)
board/altera/ep1c20/u-boot.lds deleted +0 -136
@@ -1,136 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <[email protected]> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - - -OUTPUT_FORMAT("elf32-littlenios2") -OUTPUT_ARCH(nios2) -ENTRY(_start) - -SECTIONS -{ - .text : - { - cpu/nios2/start.o (.text) - *(.text) - *(.text.*) - *(.gnu.linkonce.t*) - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r*) - } - . = ALIGN (4); - _etext = .; - PROVIDE (etext = .); - - /* CMD TABLE - sandwich this in between text and data so - * the initialization code relocates the command table as - * well -- admittedly, this is just pure laziness ;-) - */ - __u_boot_cmd_start = .; - .u_boot_cmd : - { - *(.u_boot_cmd) - } - . = ALIGN(4); - __u_boot_cmd_end = .; - - /* INIT DATA sections - "Small" data (see the gcc -G option) - * is always gp-relative. Here we make all init data sections - * adjacent to simplify the startup code -- and provide - * the global pointer for gp-relative access. - */ - _data = .; - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d*) - } - - . = ALIGN(16); - _gp = .; /* Global pointer addr */ - PROVIDE (gp = .); - - .sdata : - { - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - } - . = ALIGN(4); - - _edata = .; - PROVIDE (edata = .); - - /* UNINIT DATA - Small uninitialized data is first so it's - * adjacent to sdata and can be referenced via gp. The normal - * bss follows. We keep it adjacent to simplify init code. - */ - __bss_start = .; - .sbss (NOLOAD) : - { - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - } - . = ALIGN(4); - .bss (NOLOAD) : - { - *(.bss) - *(.bss.*) - *(.dynbss) - *(COMMON) - *(.scommon) - } - . = ALIGN(4); - _end = .; - PROVIDE (end = .); - - /* DEBUG -- symbol table, string table, etc. etc. - */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } -}
board/altera/ep1s10/u-boot.lds deleted +0 -136
136 lines not on this page · raw message
board/altera/ep1s40/u-boot.lds deleted +0 -136
136 lines not on this page · raw message
board/psyent/pci5441/u-boot.lds deleted +0 -137
137 lines not on this page · raw message
lib_nios2/Makefile +4 -1
@@ -36,9 +36,12 @@ COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_nios2/u-boot.lds.S renamed from board/psyent/pk1c20/u-boot.lds +24 -23
87 lines not on this page · raw message
nios2_config.mk +1 -0
@@ -24,3 +24,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__ PLATFORM_CPPFLAGS += -ffixed-r15 -G0 +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
Signature · 1 line
1.5.6.5
PATCH 10/11 nios: unified u-boot.lds
--- board/altera/dk1s10/u-boot.lds | 70 -------------------- board/ssv/adnpesc1/u-boot.lds | 70 -------------------- lib_nios/Makefile | 5 +- .../dk1c20/u-boot.lds => lib_nios/u-boot.lds.S | 5 +- nios_config.mk | 1 + 5 files changed, 8 insertions(+), 143 deletions(-) delete mode 100644 board/altera/dk1s10/u-boot.lds delete mode 100644 board/ssv/adnpesc1/u-boot.lds rename board/altera/dk1c20/u-boot.lds => lib_nios/u-boot.lds.S (95%)
board/altera/dk1s10/u-boot.lds deleted +0 -70
@@ -1,70 +0,0 @@ -/* - * (C) Copyright 2003, Psyent Corporation <www.psyent.com> - * Scott McNutt <[email protected]> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - - -OUTPUT_FORMAT("elf32-nios") -OUTPUT_ARCH(nios) -ENTRY(_start) - -SECTIONS -{ - .text : - { - cpu/nios/start.o (.text) - *(.text) - } - __text_end = .; - - . = ALIGN(4); - .rodata : - { - *(.rodata) - } - __rodata_end = .; - - . = ALIGN(4); - .data : - { - *(.data) - } - . = ALIGN(4); - __data_end = .; - - . = .; - __u_boot_cmd_start = .; - .u_boot_cmd : - { - *(.u_boot_cmd) - } - . = ALIGN(4); - __u_boot_cmd_end = .; - - __bss_start = .; - . = ALIGN(4); - .bss (NOLOAD) : - { - *(.bss) - } - . = ALIGN(4); - __bss_end = .; -}
board/ssv/adnpesc1/u-boot.lds deleted +0 -70
70 lines not on this page · raw message
lib_nios/Makefile +4 -1
@@ -37,9 +37,12 @@ COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_nios/u-boot.lds.S renamed from board/altera/dk1c20/u-boot.lds +3 -2
@@ -21,6 +21,7 @@ * MA 02111-1307 USA */ +#include <config.h> OUTPUT_FORMAT("elf32-nios") OUTPUT_ARCH(nios)
@@ -30,8 +31,8 @@ SECTIONS { .text : { - cpu/nios/start.o (.text) - *(.text) + cpu/nios/start.o (.text) + *(.text) } __text_end = .;
nios_config.mk +1 -0
@@ -23,3 +23,4 @@ # PLATFORM_CPPFLAGS += -m32 -DCONFIG_NIOS -D__NIOS__ -ffixed-g7 -gstabs +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
Signature · 1 line
1.5.6.5
PATCH 11/11 sparc: unified u-boot.lds
--- board/gaisler/gr_cpci_ax2000/u-boot.lds | 160 ------------------- board/gaisler/gr_ep2s60/u-boot.lds | 160 ------------------- board/gaisler/gr_xc3s_1500/u-boot.lds | 162 -------------------- board/gaisler/grsim_leon2/u-boot.lds | 159 ------------------- lib_sparc/Makefile | 5 +- .../grsim/u-boot.lds => lib_sparc/u-boot.lds.S | 70 +++++----- sparc_config.mk | 1 + 7 files changed, 40 insertions(+), 677 deletions(-) delete mode 100644 board/gaisler/gr_cpci_ax2000/u-boot.lds delete mode 100644 board/gaisler/gr_ep2s60/u-boot.lds delete mode 100644 board/gaisler/gr_xc3s_1500/u-boot.lds delete mode 100644 board/gaisler/grsim_leon2/u-boot.lds rename board/gaisler/grsim/u-boot.lds => lib_sparc/u-boot.lds.S (73%)
board/gaisler/gr_cpci_ax2000/u-boot.lds deleted +0 -160
@@ -1,160 +0,0 @@ -/* Linker script for Gaisler Research AB's GR-CPCI-AX2000 board - * with template design. - * - * (C) Copyright 2008 - * Daniel Hellstrom, Gaisler Research, daniel at gaisler.com. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - */ - -OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", "elf32-sparc") -OUTPUT_ARCH(sparc) -ENTRY(_start) -SECTIONS -{ - -/* Read-only sections, merged into text segment: */ - . = + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .rel.text : { *(.rel.text) } - .rela.text : { *(.rela.text) } - .rel.data : { *(.rel.data) } - .rela.data : { *(.rela.data) } - .rel.rodata : { *(.rel.rodata) } - .rela.rodata : { *(.rela.rodata) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } - .plt : { *(.plt) } - - .text : { - _load_addr = .; - _text = .; - - *(.start) - cpu/leon3/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ - . = ALIGN(8192); -/* PROM CODE, Will be relocated to the end of memory, - * no global data accesses please. - */ - __prom_start = .; - *(.prom.pgt) - *(.prom.data) - *(.prom.text) - . = ALIGN(16); - __prom_end = .; - *(.text) - *(.fixup) - *(.gnu.warning) -/* *(.got1)*/ - . = ALIGN(16); - *(.rodata) - *(.rodata1) - *(.rodata.*) - *(.eh_frame) - } - . = ALIGN(4); - _etext = .; - - /* CMD Table */ - - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - . = ALIGN(4); - __u_boot_cmd_end = .; - - .data : - { - *(.data) - *(.data1) - *(.data.rel) - *(.data.rel.*) - *(.sdata) - *(.sdata2) - *(.dynamic) - CONSTRUCTORS - } - _edata = .; - PROVIDE (edata = .); - - . = ALIGN(4); - __got_start = .; - .got : { - *(.got) -/* *(.data.rel) - *(.data.rel.local)*/ - . = ALIGN(16); - } - __got_end = .; - -/* .data.rel : { } */ - - . = ALIGN(4096); - __init_begin = .; - .text.init : { *(.text.init) } - .data.init : { *(.data.init) } - . = ALIGN(4096); - __init_end = .; - - __bss_start = .; - .bss : - { - *(.sbss) *(.scommon) - *(.dynbss) - *(.bss) - *(COMMON) - . = ALIGN(16); /* to speed clearing of bss up */ - } - __bss_end = . ; - _end = . ; - PROVIDE (end = .); - -/* Relocated into main memory */ - - /* Start of main memory */ - /*. = 0x40000000;*/ - - .stack (NOLOAD) : { *(.stack) } - - /* PROM CODE */ - - /* global data in RAM passed to kernel after booting */ - - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - -}
board/gaisler/gr_ep2s60/u-boot.lds deleted +0 -160
160 lines not on this page · raw message
board/gaisler/gr_xc3s_1500/u-boot.lds deleted +0 -162
162 lines not on this page · raw message
board/gaisler/grsim_leon2/u-boot.lds deleted +0 -159
159 lines not on this page · raw message
lib_sparc/Makefile +4 -1
@@ -32,9 +32,12 @@ COBJS = board.o cache.o interrupts.o time.o bootm.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) -$(LIB): $(obj).depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) +$(obj)u-boot.lds: u-boot.lds.S + $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ + ######################################################################### # defines $(obj).depend target
lib_sparc/u-boot.lds.S renamed from board/gaisler/grsim/u-boot.lds +35 -35
116 lines not on this page · raw message
sparc_config.mk +1 -0
@@ -22,3 +22,4 @@ # PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__ +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
Signature · 1 line
1.5.6.5
PATCH 8/11 mips: unified u-boot.lds
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
There is a fundamental problem with such changes:
Quoted 25 lines
board/dbau1x00/u-boot.lds deleted +0
-4@@ -1,70 +0,0 @@ -/* - * (C) Copyright 2003 - * Wolfgang Denk Engineering, <[email protected]> - *board/gth2/u-boot.lds deleted +0
-4@@ -1,70 +0,0 @@ -/* - * (C) Copyright 2003-2005 - * Wolfgang Denk Engineering, <[email protected]> - *board/tb0229/u-boot.lds deleted +0
-6@@ -1,70 +0,0 @@ -/* - * (C) Masami Komiya <[email protected]> 2004 - * - * (C) Copyright 2003 - * Wolfgang Denk Engineering, <[email protected]> - *
...
lib_mips/u-boot.lds.S line 4
Quoted 8 lines
lib_mips/u-boot.lds.S renamed from board/micronas/vct/u-boot.lds +1
-1@@ -1,5 +1,5 @@ /* - * (C) Copyright 2003 + * (C) Copyright 2003-2005 * Wolfgang Denk Engineering, <[email protected]> *
Hm... what do we do with the different (C) entries?
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 This cultural mystique surrounding the biological function -- you realize humans are overly preoccupied with the subject. -- Kelinda the Kelvan, "By Any Other Name", stardate 4658.9
Wolfgang Denk
NAKPATCH 6/11 actuax/B2: fix coding style
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
there is no Coding Style specification for loader scripts - at least I am not aware of one.
board/actux1/u-boot.lds SECTIONS · line 32
Quoted 11 lines
board/actux1/u-boot.lds +3
-8- . = ALIGN (4); - .text : { - cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) - common/dlmalloc.o(.text) - cpu/ixp/cpu.o(.text) + . = ALIGN(4); + .text : + {
If we assime C rules, then this change is to the worse.
...
Quoted 25 lines
board/actux1/u-boot.lds +2
-22- . = ALIGN (4); - .rodata : { - *(.rodata) - } - . = ALIGN (4); - .data : { - *(.data) - } - . = ALIGN (4); - .got : { - *(.got) - } - . =.; - __u_boot_cmd_start =.; - .u_boot_cmd : { - *(.u_boot_cmd) - } - __u_boot_cmd_end =.; + . = ALIGN(4); + .rodata : { *(.rodata) } - . = ALIGN (4); - __bss_start =.; - .bss (NOLOAD): { - *(.bss)
board/actux1/u-boot.lds SECTIONS · line 53
Quoted 10 lines
board/actux1/u-boot.lds +7
-3- . = ALIGN(4); - } - _end =.; + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + . = .;
You are making the code just harder to read, and more difficult to maintain as adding new lines will now be harder than it was before.
The whole change does not improve anything.
NAK.
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 one pays for pursuing any profession, or calling, is an intimate knowledge of its ugly side. - James Baldwin
PATCH 3/11 ARM: LDS remove the OUTPUT_FORMAT
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Please STOP posting patches that do not contain even a single line of explanation why you are making these changes, i. e. which problem you are trying to fix, and what makes you sure that such a change does not cause any harm, i. e. for example that the code will continue to build and run with all the different tool chains around.
NAK for the whole patch series because of serious lack of such information. Please re-read http://www.denx.de/wiki/U-Boot/Patches:
In the message body, include a description of your changes.
* For bug fixes: a description of the bug and how your patch fixes this bug. Please try to include a way of demonstrating that the patch actually fixes something.
* For new features: a description of the feature and your implementation.
Note that I will continue to NAK all patches that are missing such basic information.
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 A memorandum is written not to inform the reader, but to protect the writer. -- Dean Acheson
PATCH 3/11 ARM: LDS remove the OUTPUT_FORMAT
Quoted 5 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
We do not need to specify the output format expliciltly we just need to specify the endian via the ldflags
btw ALL this patch is just a RFC not apply
they need more work and comment I just want people to be inform about it
Best Regards,
J.
PATCH 3/11 ARM: LDS remove the OUTPUT_FORMAT
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 5 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>We do not need to specify the output format expliciltly we just need to specify the endian via the ldflags
That's the theory.
Are you positively sure that it actually works on all the tool chains?
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 Whom the gods would destroy, they first teach BASIC.
PATCH 2/11 arm: unified u-boot.lds
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 8 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- .gitignore | 1 + Makefile | 1 - arm_config.mk | 1 + board/actux1/config.mk | 1 + board/actux2/config.mk | 1 + board/actux3/config.mk | 1 +
...
arm_config.mk line 25
Quoted 9 lines
arm_config.mk +1
-0@@ -22,3 +22,4 @@ # PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds
---------------^^^^^^^^^^
board/actux1/config.mk TEXT_BASE = 0x00e00000 · line 5
Quoted 9 lines
board/actux1/config.mk +1
-0@@ -2,3 +2,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
--------------^^^^^^^^^^
etc.
Is it $(OBJTREE)/lib_$(ARCH) or $(SRCTREE)/board/$(BOARDDIR) ?
Should we not put a generic definition in the top level Makefile that then can be oiverridden (where needed) in the config files?
...
Quoted 2 lines
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
...
Quoted 8 lines
- * Copyright (C) 2005-2007 Samsung Electronics
- * Kyungin Park <[email protected]>
- *
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>
...
Quoted 3 lines
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2004 (c) MontaVista Software, Inc.
...
Quoted 2 lines
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
...
Quoted 3 lines
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2003 (c) MontaVista Software, Inc.
...
Quoted 2 lines
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
...
Quoted 5 lines
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>
...
Quoted 3 lines
- * (c) Copyright 2004
- * Techware Information Technology, Inc.
- * http://www.techware.com.tw/
...
Quoted 2 lines
- * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>
...
Quoted 2 lines
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
...
Quoted 2 lines
- * (C) Copyright 2000-2005
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
...
Quoted 2 lines
- * (C) Copyright 2004
- * Wolfgang Denk, DENX Software Engineering, <[email protected]>
I'm not sure if you can simply drop all these Copyright notices (even if the code was oviously all just copied from the same base file.
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 Remember that Beethoven wrote his first symphony in C ...
PATCH 2/11 arm: unified u-boot.lds
Quoted 34 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 8 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- .gitignore | 1 + Makefile | 1 - arm_config.mk | 1 + board/actux1/config.mk | 1 + board/actux2/config.mk | 1 + board/actux3/config.mk | 1 +...
arm_config.mk line 25
Quoted 9 lines
arm_config.mk +1
-0@@ -22,3 +22,4 @@ # PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ +LDSCRIPT := $(OBJTREE)/lib_$(ARCH)/u-boot.lds---------------^^^^^^^^^^
board/actux1/config.mk TEXT_BASE = 0x00e00000 · line 5
Quoted 9 lines
board/actux1/config.mk +1
-0@@ -2,3 +2,4 @@ TEXT_BASE = 0x00e00000 # include NPE ethernet driver BOARDLIBS = cpu/ixp/npe/libnpe.a +LDSCRIPT = $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds--------------^^^^^^^^^^
Quoted 6 lines
etc.
Is it $(OBJTREE)/lib_$(ARCH) or $(SRCTREE)/board/$(BOARDDIR) ?
Should we not put a generic definition in the top level
Makefilethat then can be oiverridden (where needed) in the config files?
it's the case it's call in this sequence
the arch is call first
the cpu
the soc
and the board last so you can overwrite the LDSCRPIT when you want
By default it's the ARCH lds that will be use but due to some board (we need to investigate why) we overwrite and a board specific lds which I try to avoid when it's possible
Quoted 47 lines
...
Quoted 2 lines
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de....
Quoted 8 lines
- * Copyright (C) 2005-2007 Samsung Electronics
- * Kyungin Park <[email protected]>
- *
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>...
Quoted 3 lines
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2004 (c) MontaVista Software, Inc....
Quoted 2 lines
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de....
Quoted 3 lines
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2003 (c) MontaVista Software, Inc....
Quoted 2 lines
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments...
Quoted 5 lines
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>...
Quoted 3 lines
- * (c) Copyright 2004
- * Techware Information Technology, Inc.
- * http://www.techware.com.tw/...
Quoted 2 lines
- * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>...
Quoted 2 lines
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de....
Quoted 2 lines
- * (C) Copyright 2000-2005
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
Quoted 7 lines
...
Quoted 2 lines
- * (C) Copyright 2004
- * Wolfgang Denk, DENX Software Engineering, <[email protected]>I'm not sure if you can simply drop all these Copyright notices (even if the code was oviously all just copied from the same base file.
Not sure too but it's the same file, actually I've use one as reference and remove the all other. Maybe we need to report all the copyright to the generic one
Best Regards,
J.
PATCH 1/11 mkconfig: export ARCH, CPU, SOC, BOARD, VENDOR to config.h
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 11 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- mkconfig | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-)mkconfig +0
-0@@ -62,25 +62,35 @@ if [ "$2" = "arm" ] ; then fi
mkconfig if [ "$2" = "arm" ] ; then · line 72
Quoted 10 lines
mkconfig +8
-0# +# Create board specific header file +# +if [ "$APPEND" != "yes" ] # Append to existing config file +then + > config.h # Create new config file +fi + +#
This is never necessary. Remove that.
mkconfig if [ "$2" = "arm" ] ; then · line 85
Quoted 13 lines
mkconfig +7
-1# Create include file for Make # echo "ARCH = $2" > config.mk +echo "#define CONFIG_ARCH $2" >> config.h echo "CPU = $3" >> config.mk +echo "#define CONFIG_CPU $3" >> config.h echo "BOARD = $4" >> config.mk +echo "#define CONFIG_BOARD $4" >> config.h -[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk +[ "$5" ] && [ "$5" != "NULL" ] && { + echo "VENDOR = $5" >> config.mk + echo "#define CONFIG_VENDOR $5" >> config.h +}
Please do NOT do this.
The setting up CONFIG_ options is done in the board config file, and NOT in the Makefile.
This patch will cause conflicts with MANY boards.
Maybe you would like to explain WHY you are trying to do that?
NAK for now.
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 Madness takes its toll. Please have exact change.
PATCH 1/11 mkconfig: export ARCH, CPU, SOC, BOARD, VENDOR to config.h
Quoted 43 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 11 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- mkconfig | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-)mkconfig +0
-0@@ -62,25 +62,35 @@ if [ "$2" = "arm" ] ; then fimkconfig if [ "$2" = "arm" ] ; then · line 72
Quoted 10 lines
mkconfig +8
-0# +# Create board specific header file +# +if [ "$APPEND" != "yes" ] # Append to existing config file +then + > config.h # Create new config file +fi + +#This is never necessary. Remove that.
mkconfig if [ "$2" = "arm" ] ; then · line 85
Quoted 13 lines
mkconfig +7
-1# Create include file for Make # echo "ARCH = $2" > config.mk +echo "#define CONFIG_ARCH $2" >> config.h echo "CPU = $3" >> config.mk +echo "#define CONFIG_CPU $3" >> config.h echo "BOARD = $4" >> config.mk +echo "#define CONFIG_BOARD $4" >> config.h -[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk +[ "$5" ] && [ "$5" != "NULL" ] && { + echo "VENDOR = $5" >> config.mk + echo "#define CONFIG_VENDOR $5" >> config.h +}Please do NOT do this.
Quoted 7 lines
The setting up
CONFIG_options is done in the board config file, and NOT in theMakefile.This patch will cause conflicts with MANY boards.
Maybe you would like to explain WHY you are trying to do that?
whe need to known which CPU, BOARD and co is currently use to the generate the lds
as example to specify the start.o to use
Best Regards,
J.
PATCH 1/11 mkconfig: export ARCH, CPU, SOC, BOARD, VENDOR to config.h
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 12 lines · In message <[email protected]> you wrote:
Quoted 12 lines
mkconfig if [ "$2" = "arm" ] ; then · line 85
Quoted 6 lines
-[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk +[ "$5" ] && [ "$5" != "NULL" ] && {
mkconfig +3
-0+ echo "VENDOR = $5" >> config.mk + echo "#define CONFIG_VENDOR $5" >> config.h +}Please do NOT do this.
The setting up
CONFIG_options is done in the board config file, and NOT in theMakefile.
Quoted 7 lines
Quoted 4 lines
This patch will cause conflicts with MANY boards.
Maybe you would like to explain WHY you are trying to do that?
whe need to known which CPU, BOARD and co is currently use to the generate the lds
as example to specify the start.o to use
But you do not generate the linker script from the C header file - that makes no sense to me.
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 Build a system that even a fool can use and only a fool will want to use it.
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 5 lines · In message <[email protected]> you wrote:
I'm working actually to unify the lds of ARM, SH, and some other arch in order to firstly improve its maintaining and secondly prepare the field to the introduction of the initcall for in a first time post relocation.
What exactly do you mean by "introduction of the initcall for in a first time post relocation" ?
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
C++ was an interesting and valuable experiment, but we've learned its
lessons and it's time to move on.
- Peter Curran in <[email protected]>Quoted 11 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 5 lines · In message <[email protected]> you wrote:
I'm working actually to unify the lds of ARM, SH, and some other arch in order to firstly improve its maintaining and secondly prepare the field to the introduction of the initcall for in a first time post relocation.
What exactly do you mean by "introduction of the initcall for in a first time post relocation" ?
initcall before relocation could need special handle because u-boot is not in RAM so I've prefer to first work only after u-boot relocation and next continue on the support of the initcall before relocation.
Best Regards,
J.
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 10 lines · In message <[email protected]> you wrote:
Quoted 9 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 5 lines · In message <[email protected]> you wrote:
I'm working actually to unify the lds of ARM, SH, and some other arch in order to firstly improve its maintaining and secondly prepare the field to the introduction of the initcall for in a first time post relocation.
Quoted 5 lines
Quoted 2 lines
What exactly do you mean by "introduction of the initcall for in a first time post relocation" ?
initcall before relocation could need special handle because u-boot is not in RAM so I've prefer to first work only after u-boot relocation and next continue on the support of the initcall before relocation.
Could you please explain what you actually mean by "initcall"? If we knew what you are talking about it would be much easier to make comments about this...
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 I am pleased to see that we have differences. May we together become greater than the sum of both of us. -- Surak of Vulcan, "The Savage Curtain", stardate 5906.4
Quoted 7 lines · On Wednesday 25 February 2009 01:09:34 Jean-Christophe PLAGNIOL-VILLARD wrote:
I'm working actually to unify the lds of ARM, SH, and some other arch in order to firstly improve its maintaining and secondly prepare the field to the introduction of the initcall for in a first time post relocation.
Please all Custodian take a look and please try to help on your own area
i dont know anything about what you're attempting to do here specifically, but most Blackfin boards have had their LDS scripts unified because it gets sent through the preprocessor to pick up board-specific defines (so most every script is a copy & paste in the boards dir). if there was support for a default linker script in cpu/$(CPU)/ which could be overridden in boards/$(BOARD)/, then i would certainly start using it.
now that i think about it, i bet it could be done already ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090225/0a1a5682/attachment.pgp