[U-Boot] [PATCH] arm: unify lds
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Sat May 9 00:55:23 CEST 2009
all arm boards except a few use the same cpu lds so move it to cpu/$(CPU)
that could be overwrite in following order
SOC
BOARD
via the corresponding config.mk
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
Due to ML limitation
I've reduce the content of the patch to show only the Copyright
of the removed file
btw all copyrights have been respected and now merged in the final lds
Best Regards,
J.
arm_config.mk | 2 +
board/actux1/config.mk | 2 +
board/actux2/config.mk | 2 +
board/actux3/config.mk | 2 +
board/actux4/u-boot.lds | 66 ----------------------
board/armadillo/u-boot.lds | 55 ------------------
board/armltd/integratorap/config.mk | 6 --
board/armltd/integratorap/split_by_variant.sh | 4 -
board/armltd/integratorap/u-boot.lds.template | 53 -----------------
board/armltd/integratorcp/config.mk | 6 --
board/armltd/integratorcp/split_by_variant.sh | 4 -
board/armltd/integratorcp/u-boot.lds.template | 53 -----------------
board/armltd/versatile/u-boot.lds | 51 -----------------
board/atmel/at91rm9200dk/u-boot.lds | 57 -------------------
board/atmel/at91rm9200ek/u-boot.lds | 56 ------------------
board/cerf250/u-boot.lds | 56 ------------------
board/cm4008/u-boot.lds | 56 ------------------
board/cm41xx/u-boot.lds | 56 ------------------
board/cmc_pu2/u-boot.lds | 57 -------------------
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/davedenx/qong/u-boot.lds | 58 -------------------
board/delta/u-boot.lds | 56 ------------------
board/dnp1110/u-boot.lds | 56 ------------------
board/ep7312/u-boot.lds | 56 ------------------
board/evb4510/u-boot.lds | 69 -----------------------
board/freescale/mx31ads/config.mk | 2 +
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/kb9202/u-boot.lds | 56 ------------------
board/lart/u-boot.lds | 56 ------------------
board/logodl/u-boot.lds | 56 ------------------
board/lpc2292sodimm/u-boot.lds | 55 ------------------
board/lubbock/u-boot.lds | 56 ------------------
board/m501sk/u-boot.lds | 55 ------------------
board/modnet50/u-boot.lds | 69 -----------------------
board/mp2usb/u-boot.lds | 56 ------------------
board/mpl/vcma9/u-boot.lds | 57 -------------------
board/mx1ads/u-boot.lds | 58 -------------------
board/netstar/u-boot.lds | 55 ------------------
board/ns9750dev/u-boot.lds | 59 -------------------
board/omap1510inn/u-boot.lds | 57 -------------------
board/omap2420h4/u-boot.lds | 59 -------------------
board/pleb2/u-boot.lds | 56 ------------------
board/prodrive/pdnb3/u-boot.lds | 56 ------------------
board/samsung/smdk2400/u-boot.lds | 57 -------------------
board/samsung/smdk2410/u-boot.lds | 57 -------------------
board/samsung/smdk6400/config.mk | 2 +
board/sbc2410x/u-boot.lds | 56 ------------------
board/shannon/u-boot.lds | 56 ------------------
board/siemens/SMN42/u-boot.lds | 55 ------------------
board/sx1/u-boot.lds | 57 -------------------
board/trab/config.mk | 2 +
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/xsengine/u-boot.lds | 56 ------------------
board/zylonite/u-boot.lds | 56 ------------------
{board/apollon => cpu/arm1136}/u-boot.lds | 5 +-
{board/omap5912osk => cpu/arm1176}/u-boot.lds | 10 ++-
{board/scb9328 => cpu/arm720t}/u-boot.lds | 7 +-
{board/xm250 => cpu/arm920t}/u-boot.lds | 14 ++++-
{board/lpd7a40x => cpu/arm925t}/u-boot.lds | 10 ++-
cpu/arm926ejs/at91/config.mk | 1 -
cpu/arm926ejs/at91/u-boot.lds | 57 -------------------
cpu/arm926ejs/davinci/config.mk | 2 -
{board/st/nmdk8815 => cpu/arm926ejs}/u-boot.lds | 9 ++-
cpu/{arm926ejs/davinci => arm946es}/u-boot.lds | 10 ++-
cpu/arm_cortexa8/omap3/config.mk | 2 -
cpu/arm_cortexa8/{omap3 => }/u-boot.lds | 0
{board/omap1610inn => cpu/arm_intcm}/u-boot.lds | 10 ++-
{board/ixdp425 => cpu/ixp}/u-boot.lds | 8 +-
{board/omap730p2 => cpu/lh7a40x}/u-boot.lds | 10 ++-
{board/pxa255_idp => cpu/pxa}/u-boot.lds | 6 +-
{board/mx1fs2 => cpu/s3c44b0}/u-boot.lds | 5 +-
{board/assabet => cpu/sa1100}/u-boot.lds | 7 +-
82 files changed, 85 insertions(+), 3137 deletions(-)
delete mode 100644 board/actux4/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/atmel/at91rm9200dk/u-boot.lds
delete mode 100644 board/atmel/at91rm9200ek/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/cmc_pu2/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/davedenx/qong/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/evb4510/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/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/lubbock/u-boot.lds
delete mode 100644 board/m501sk/u-boot.lds
delete mode 100644 board/modnet50/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/netstar/u-boot.lds
delete mode 100644 board/ns9750dev/u-boot.lds
delete mode 100644 board/omap1510inn/u-boot.lds
delete mode 100644 board/omap2420h4/u-boot.lds
delete mode 100644 board/pleb2/u-boot.lds
delete mode 100644 board/prodrive/pdnb3/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/shannon/u-boot.lds
delete mode 100644 board/siemens/SMN42/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/xsengine/u-boot.lds
delete mode 100644 board/zylonite/u-boot.lds
rename {board/apollon => cpu/arm1136}/u-boot.lds (94%)
rename {board/omap5912osk => cpu/arm1176}/u-boot.lds (96%)
rename {board/scb9328 => cpu/arm720t}/u-boot.lds (92%)
rename {board/xm250 => cpu/arm920t}/u-boot.lds (84%)
rename {board/lpd7a40x => cpu/arm925t}/u-boot.lds (91%)
delete mode 100644 cpu/arm926ejs/at91/u-boot.lds
rename {board/st/nmdk8815 => cpu/arm926ejs}/u-boot.lds (96%)
rename cpu/{arm926ejs/davinci => arm946es}/u-boot.lds (96%)
rename cpu/arm_cortexa8/{omap3 => }/u-boot.lds (100%)
rename {board/omap1610inn => cpu/arm_intcm}/u-boot.lds (96%)
rename {board/ixdp425 => cpu/ixp}/u-boot.lds (94%)
rename {board/omap730p2 => cpu/lh7a40x}/u-boot.lds (96%)
rename {board/pxa255_idp => cpu/pxa}/u-boot.lds (96%)
rename {board/mx1fs2 => cpu/s3c44b0}/u-boot.lds (96%)
rename {board/assabet => cpu/sa1100}/u-boot.lds (95%)
diff --git a/arm_config.mk b/arm_config.mk
index 73d9625..c4cf99d 100644
--- a/arm_config.mk
+++ b/arm_config.mk
@@ -22,3 +22,5 @@
#
PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__
+
+LDSCRIPT := $(SRCTREE)/cpu/$(CPU)/u-boot.lds
diff --git a/board/actux1/config.mk b/board/actux1/config.mk
index 9a634cd..119140d 100644
--- a/board/actux1/config.mk
+++ b/board/actux1/config.mk
@@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000
# include NPE ethernet driver
BOARDLIBS = cpu/ixp/npe/libnpe.a
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux2/config.mk b/board/actux2/config.mk
index 9a634cd..119140d 100644
--- a/board/actux2/config.mk
+++ b/board/actux2/config.mk
@@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000
# include NPE ethernet driver
BOARDLIBS = cpu/ixp/npe/libnpe.a
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux3/config.mk b/board/actux3/config.mk
index 9a634cd..119140d 100644
--- a/board/actux3/config.mk
+++ b/board/actux3/config.mk
@@ -2,3 +2,5 @@ TEXT_BASE = 0x00e00000
# include NPE ethernet driver
BOARDLIBS = cpu/ixp/npe/libnpe.a
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/actux4/u-boot.lds b/board/actux4/u-boot.lds
deleted file mode 100644
index 10a5da9..0000000
--- a/board/actux4/u-boot.lds
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/armadillo/u-boot.lds b/board/armadillo/u-boot.lds
deleted file mode 100644
index cb5a3ba..0000000
--- a/board/armadillo/u-boot.lds
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/armltd/integratorap/config.mk b/board/armltd/integratorap/config.mk
index e4c5c3b..25b79b3 100644
--- a/board/armltd/integratorap/config.mk
+++ b/board/armltd/integratorap/config.mk
@@ -3,9 +3,3 @@
#
TEXT_BASE = 0x01000000
-
-ifneq ($(OBJTREE),$(SRCTREE))
-# We are building u-boot in a separate directory, use generated
-# .lds script from OBJTREE directory.
-LDSCRIPT := $(OBJTREE)/board/$(BOARDDIR)/u-boot.lds
-endif
diff --git a/board/armltd/integratorap/split_by_variant.sh b/board/armltd/integratorap/split_by_variant.sh
index 2c9fe2e..2f86b52 100755
--- a/board/armltd/integratorap/split_by_variant.sh
+++ b/board/armltd/integratorap/split_by_variant.sh
@@ -120,10 +120,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;
diff --git a/board/armltd/integratorap/u-boot.lds.template b/board/armltd/integratorap/u-boot.lds.template
deleted file mode 100644
index 0ec8087..0000000
--- a/board/armltd/integratorap/u-boot.lds.template
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/armltd/integratorcp/config.mk b/board/armltd/integratorcp/config.mk
index e4c5c3b..25b79b3 100644
--- a/board/armltd/integratorcp/config.mk
+++ b/board/armltd/integratorcp/config.mk
@@ -3,9 +3,3 @@
#
TEXT_BASE = 0x01000000
-
-ifneq ($(OBJTREE),$(SRCTREE))
-# We are building u-boot in a separate directory, use generated
-# .lds script from OBJTREE directory.
-LDSCRIPT := $(OBJTREE)/board/$(BOARDDIR)/u-boot.lds
-endif
diff --git a/board/armltd/integratorcp/split_by_variant.sh b/board/armltd/integratorcp/split_by_variant.sh
index 34422fd..13effef 100755
--- a/board/armltd/integratorcp/split_by_variant.sh
+++ b/board/armltd/integratorcp/split_by_variant.sh
@@ -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;
diff --git a/board/armltd/integratorcp/u-boot.lds.template b/board/armltd/integratorcp/u-boot.lds.template
deleted file mode 100644
index 0ec8087..0000000
--- a/board/armltd/integratorcp/u-boot.lds.template
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/armltd/versatile/u-boot.lds b/board/armltd/versatile/u-boot.lds
deleted file mode 100644
index 48c2613..0000000
--- a/board/armltd/versatile/u-boot.lds
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/atmel/at91rm9200dk/u-boot.lds b/board/atmel/at91rm9200dk/u-boot.lds
deleted file mode 100644
index 33363c2..0000000
--- a/board/atmel/at91rm9200dk/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/atmel/at91rm9200ek/u-boot.lds b/board/atmel/at91rm9200ek/u-boot.lds
deleted file mode 100644
index 045e849..0000000
--- a/board/atmel/at91rm9200ek/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/cerf250/u-boot.lds b/board/cerf250/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/cerf250/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/cm4008/u-boot.lds b/board/cm4008/u-boot.lds
deleted file mode 100644
index e96c45f..0000000
--- a/board/cm4008/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/cm41xx/u-boot.lds b/board/cm41xx/u-boot.lds
deleted file mode 100644
index e96c45f..0000000
--- a/board/cm41xx/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/cmc_pu2/u-boot.lds b/board/cmc_pu2/u-boot.lds
deleted file mode 100644
index 33363c2..0000000
--- a/board/cmc_pu2/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/cradle/u-boot.lds b/board/cradle/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/cradle/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/csb226/u-boot.lds b/board/csb226/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/csb226/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/csb637/u-boot.lds b/board/csb637/u-boot.lds
deleted file mode 100644
index 3eae0e2..0000000
--- a/board/csb637/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/dave/B2/u-boot.lds b/board/dave/B2/u-boot.lds
deleted file mode 100644
index 1690b6e..0000000
--- a/board/dave/B2/u-boot.lds
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/davedenx/qong/u-boot.lds b/board/davedenx/qong/u-boot.lds
deleted file mode 100644
index 04e0642..0000000
--- a/board/davedenx/qong/u-boot.lds
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (C) Copyright 2009
- * Ilya Yanok, Emcraft Systems Ltd, <yanok at emcraft.com>
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
diff --git a/board/delta/u-boot.lds b/board/delta/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/delta/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/dnp1110/u-boot.lds b/board/dnp1110/u-boot.lds
deleted file mode 100644
index 13b7bb7..0000000
--- a/board/dnp1110/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/ep7312/u-boot.lds b/board/ep7312/u-boot.lds
deleted file mode 100644
index 8c9f624..0000000
--- a/board/ep7312/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/evb4510/u-boot.lds b/board/evb4510/u-boot.lds
deleted file mode 100644
index b72e126..0000000
--- a/board/evb4510/u-boot.lds
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/freescale/mx31ads/config.mk b/board/freescale/mx31ads/config.mk
index d34dc02..7ec0fe2 100644
--- a/board/freescale/mx31ads/config.mk
+++ b/board/freescale/mx31ads/config.mk
@@ -1 +1,3 @@
TEXT_BASE = 0x87f00000
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/gcplus/u-boot.lds b/board/gcplus/u-boot.lds
deleted file mode 100644
index 65b8167..0000000
--- a/board/gcplus/u-boot.lds
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2003 (c) MontaVista Software, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/impa7/u-boot.lds b/board/impa7/u-boot.lds
deleted file mode 100644
index 8c9f624..0000000
--- a/board/impa7/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/imx31_litekit/u-boot.lds b/board/imx31_litekit/u-boot.lds
deleted file mode 100644
index f840017..0000000
--- a/board/imx31_litekit/u-boot.lds
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/imx31_phycore/u-boot.lds b/board/imx31_phycore/u-boot.lds
deleted file mode 100644
index f840017..0000000
--- a/board/imx31_phycore/u-boot.lds
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/innokom/u-boot.lds b/board/innokom/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/innokom/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/kb9202/u-boot.lds b/board/kb9202/u-boot.lds
deleted file mode 100644
index 3eae0e2..0000000
--- a/board/kb9202/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/lart/u-boot.lds b/board/lart/u-boot.lds
deleted file mode 100644
index 13b7bb7..0000000
--- a/board/lart/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/logodl/u-boot.lds b/board/logodl/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/logodl/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/lpc2292sodimm/u-boot.lds b/board/lpc2292sodimm/u-boot.lds
deleted file mode 100644
index cb5a3ba..0000000
--- a/board/lpc2292sodimm/u-boot.lds
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/lubbock/u-boot.lds b/board/lubbock/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/lubbock/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/m501sk/u-boot.lds b/board/m501sk/u-boot.lds
deleted file mode 100644
index 2247c37..0000000
--- a/board/m501sk/u-boot.lds
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/modnet50/u-boot.lds b/board/modnet50/u-boot.lds
deleted file mode 100644
index b72e126..0000000
--- a/board/modnet50/u-boot.lds
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/mp2usb/u-boot.lds b/board/mp2usb/u-boot.lds
deleted file mode 100644
index 3eae0e2..0000000
--- a/board/mp2usb/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/mpl/vcma9/u-boot.lds b/board/mpl/vcma9/u-boot.lds
deleted file mode 100644
index 33363c2..0000000
--- a/board/mpl/vcma9/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/mx1ads/u-boot.lds b/board/mx1ads/u-boot.lds
deleted file mode 100644
index 1c710cb..0000000
--- a/board/mx1ads/u-boot.lds
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * board/mx1ads/u-boot.lds
- *
- * (c) Copyright 2004
- * Techware Information Technology, Inc.
- * http://www.techware.com.tw/
- *
- * Ming-Len Wu <minglen_wu at techware.com.tw>
- *
- * 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.
- *
diff --git a/board/netstar/u-boot.lds b/board/netstar/u-boot.lds
deleted file mode 100644
index 6a5510a..0000000
--- a/board/netstar/u-boot.lds
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/ns9750dev/u-boot.lds b/board/ns9750dev/u-boot.lds
deleted file mode 100644
index b7fc19c..0000000
--- a/board/ns9750dev/u-boot.lds
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/omap1510inn/u-boot.lds b/board/omap1510inn/u-boot.lds
deleted file mode 100644
index 13b3643..0000000
--- a/board/omap1510inn/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/omap2420h4/u-boot.lds b/board/omap2420h4/u-boot.lds
deleted file mode 100644
index 46535dd..0000000
--- a/board/omap2420h4/u-boot.lds
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/pleb2/u-boot.lds b/board/pleb2/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/pleb2/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/prodrive/pdnb3/u-boot.lds b/board/prodrive/pdnb3/u-boot.lds
deleted file mode 100644
index 6324436..0000000
--- a/board/prodrive/pdnb3/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/samsung/smdk2400/u-boot.lds b/board/samsung/smdk2400/u-boot.lds
deleted file mode 100644
index 33363c2..0000000
--- a/board/samsung/smdk2400/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/samsung/smdk2410/u-boot.lds b/board/samsung/smdk2410/u-boot.lds
deleted file mode 100644
index 33363c2..0000000
--- a/board/samsung/smdk2410/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk
index 298d387..705d121 100644
--- a/board/samsung/smdk6400/config.mk
+++ b/board/samsung/smdk6400/config.mk
@@ -28,3 +28,5 @@ TEXT_BASE = $(RAM_TEXT)
else
TEXT_BASE = 0
endif
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot-nand.lds
diff --git a/board/sbc2410x/u-boot.lds b/board/sbc2410x/u-boot.lds
deleted file mode 100644
index 3eae0e2..0000000
--- a/board/sbc2410x/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/shannon/u-boot.lds b/board/shannon/u-boot.lds
deleted file mode 100644
index 13b7bb7..0000000
--- a/board/shannon/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/siemens/SMN42/u-boot.lds b/board/siemens/SMN42/u-boot.lds
deleted file mode 100644
index cb5a3ba..0000000
--- a/board/siemens/SMN42/u-boot.lds
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/sx1/u-boot.lds b/board/sx1/u-boot.lds
deleted file mode 100644
index af0b4d0..0000000
--- a/board/sx1/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2004
- * Wolfgang Denk, DENX Software Engineering, <wg at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/trab/config.mk b/board/trab/config.mk
index 800cc28..d2d9465 100644
--- a/board/trab/config.mk
+++ b/board/trab/config.mk
@@ -24,3 +24,5 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
TEXT_BASE = 0x0DF40000
endif
+
+LDSCRIPT := $(SRCTREE)/board/$(BOARDDIR)/u-boot.lds
diff --git a/board/trizepsiv/u-boot.lds b/board/trizepsiv/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/trizepsiv/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/voiceblue/u-boot.lds b/board/voiceblue/u-boot.lds
deleted file mode 100644
index 97fcef3..0000000
--- a/board/voiceblue/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/wepep250/u-boot.lds b/board/wepep250/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/wepep250/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/xaeniax/u-boot.lds b/board/xaeniax/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/xaeniax/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/xsengine/u-boot.lds b/board/xsengine/u-boot.lds
deleted file mode 100644
index 8af5001..0000000
--- a/board/xsengine/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/zylonite/u-boot.lds b/board/zylonite/u-boot.lds
deleted file mode 100644
index a077bc5..0000000
--- a/board/zylonite/u-boot.lds
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/board/apollon/u-boot.lds b/cpu/arm1136/u-boot.lds
similarity index 94%
rename from board/apollon/u-boot.lds
rename to cpu/arm1136/u-boot.lds
index 7fb7e04..830aaa8 100644
--- a/board/apollon/u-boot.lds
+++ b/cpu/arm1136/u-boot.lds
@@ -1,9 +1,10 @@
/*
+ * (C) Copyright 2009
+ * Ilya Yanok, Emcraft Systems Ltd, <yanok at emcraft.com>
*
* Copyright (C) 2005-2007 Samsung Electronics
* Kyungin Park <kyugnmin.park at samsung.com>
*
- * January 2004 - Changed to support H4 device
* Copyright (c) 2004 Texas Instruments
*
* (C) Copyright 2002
@@ -36,7 +37,7 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
cpu/arm1136/start.o (.text)
*(.text)
diff --git a/board/omap5912osk/u-boot.lds b/cpu/arm1176/u-boot.lds
similarity index 96%
rename from board/omap5912osk/u-boot.lds
rename to cpu/arm1176/u-boot.lds
index 3132b9a..2dafb09 100644
--- a/board/omap5912osk/u-boot.lds
+++ b/cpu/arm1176/u-boot.lds
@@ -27,16 +27,20 @@ ENTRY(_start)
SECTIONS
{
. = 0x00000000;
+
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm926ejs/start.o (.text)
- *(.text)
+ cpu/arm1176/start.o (.text)
+ *(.text)
}
+
. = ALIGN(4);
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
. = ALIGN(4);
.data : { *(.data) }
+
. = ALIGN(4);
.got : { *(.got) }
diff --git a/board/scb9328/u-boot.lds b/cpu/arm720t/u-boot.lds
similarity index 92%
rename from board/scb9328/u-boot.lds
rename to cpu/arm720t/u-boot.lds
index d912d93..111c3f5 100644
--- a/board/scb9328/u-boot.lds
+++ b/cpu/arm720t/u-boot.lds
@@ -12,14 +12,13 @@
*
* 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
+ * 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-littlearm", "elf32-littlearm", "elf32-littlearm")
@@ -30,9 +29,9 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm920t/start.o (.text)
+ cpu/arm720t/start.o (.text)
*(.text)
}
diff --git a/board/xm250/u-boot.lds b/cpu/arm920t/u-boot.lds
similarity index 84%
rename from board/xm250/u-boot.lds
rename to cpu/arm920t/u-boot.lds
index 8af5001..d9bfbee 100644
--- a/board/xm250/u-boot.lds
+++ b/cpu/arm920t/u-boot.lds
@@ -1,7 +1,14 @@
/*
+ * (c) Copyright 2004
+ * Techware Information Technology, Inc.
+ * Ming-Len Wu <minglen_wu at techware.com.tw>
+ *
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd at denx.de.
*
+ * (C) Copyright 2002
+ * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
@@ -19,6 +26,7 @@
* 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-littlearm", "elf32-littlearm", "elf32-littlearm")
@@ -29,10 +37,10 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/pxa/start.o (.text)
- *(.text)
+ cpu/arm920t/start.o (.text)
+ *(.text)
}
. = ALIGN(4);
diff --git a/board/lpd7a40x/u-boot.lds b/cpu/arm925t/u-boot.lds
similarity index 91%
rename from board/lpd7a40x/u-boot.lds
rename to cpu/arm925t/u-boot.lds
index b98ed95..fc1c890 100644
--- a/board/lpd7a40x/u-boot.lds
+++ b/cpu/arm925t/u-boot.lds
@@ -1,4 +1,7 @@
/*
+ * (C) Copyright 2004
+ * Wolfgang Denk, DENX Software Engineering, <wg at denx.de>
+ *
* (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
*
@@ -22,7 +25,6 @@
*/
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-/*OUTPUT_FORMAT("elf32-arm", "elf32-arm", "elf32-arm")*/
OUTPUT_ARCH(arm)
ENTRY(_start)
SECTIONS
@@ -30,10 +32,10 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/lh7a40x/start.o (.text)
- *(.text)
+ cpu/arm925t/start.o (.text)
+ *(.text)
}
. = ALIGN(4);
diff --git a/cpu/arm926ejs/at91/config.mk b/cpu/arm926ejs/at91/config.mk
index 06177e6..19296fd 100644
--- a/cpu/arm926ejs/at91/config.mk
+++ b/cpu/arm926ejs/at91/config.mk
@@ -1,2 +1 @@
PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
-LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91/u-boot.lds
diff --git a/cpu/arm926ejs/at91/u-boot.lds b/cpu/arm926ejs/at91/u-boot.lds
deleted file mode 100644
index 62a3e95..0000000
--- a/cpu/arm926ejs/at91/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
diff --git a/cpu/arm926ejs/davinci/config.mk b/cpu/arm926ejs/davinci/config.mk
index 5221444..a57d03a 100644
--- a/cpu/arm926ejs/davinci/config.mk
+++ b/cpu/arm926ejs/davinci/config.mk
@@ -33,5 +33,3 @@ PLATFORM_CPPFLAGS += -march=armv5te
PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,)
PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
-
-LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/davinci/u-boot.lds
diff --git a/board/st/nmdk8815/u-boot.lds b/cpu/arm926ejs/u-boot.lds
similarity index 96%
rename from board/st/nmdk8815/u-boot.lds
rename to cpu/arm926ejs/u-boot.lds
index c2adbab..ee5eeb5 100644
--- a/board/st/nmdk8815/u-boot.lds
+++ b/cpu/arm926ejs/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2002
+ * (C) Copyright 2002-2004
* Gary Jennejohn, DENX Software Engineering, <gj at denx.de>
*
* See file CREDITS for list of people who contributed to this
@@ -27,19 +27,24 @@ ENTRY(_start)
SECTIONS
{
. = 0x00000000;
+
. = ALIGN(4);
- .text :
+ .text :
{
cpu/arm926ejs/start.o (.text)
*(.text)
}
+
. = ALIGN(4);
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
. = ALIGN(4);
.data : { *(.data) }
+
. = ALIGN(4);
.got : { *(.got) }
+ . = .;
__u_boot_cmd_start = .;
.u_boot_cmd : { *(.u_boot_cmd) }
__u_boot_cmd_end = .;
diff --git a/cpu/arm926ejs/davinci/u-boot.lds b/cpu/arm946es/u-boot.lds
similarity index 96%
rename from cpu/arm926ejs/davinci/u-boot.lds
rename to cpu/arm946es/u-boot.lds
index 4d50f2c..04831ed 100644
--- a/cpu/arm926ejs/davinci/u-boot.lds
+++ b/cpu/arm946es/u-boot.lds
@@ -27,16 +27,20 @@ ENTRY(_start)
SECTIONS
{
. = 0x00000000;
+
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm926ejs/start.o (.text)
- *(.text)
+ cpu/arm946es/start.o (.text)
+ *(.text)
}
+
. = ALIGN(4);
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
. = ALIGN(4);
.data : { *(.data) }
+
. = ALIGN(4);
.got : { *(.got) }
diff --git a/cpu/arm_cortexa8/omap3/config.mk b/cpu/arm_cortexa8/omap3/config.mk
index 7fd364e..fbb753e 100644
--- a/cpu/arm_cortexa8/omap3/config.mk
+++ b/cpu/arm_cortexa8/omap3/config.mk
@@ -34,5 +34,3 @@ PLATFORM_CPPFLAGS +=$(call cc-option)
PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,)
PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\
$(call cc-option,-malignment-traps,))
-
-LDSCRIPT := $(SRCTREE)/cpu/arm_cortexa8/omap3/u-boot.lds
diff --git a/cpu/arm_cortexa8/omap3/u-boot.lds b/cpu/arm_cortexa8/u-boot.lds
similarity index 100%
rename from cpu/arm_cortexa8/omap3/u-boot.lds
rename to cpu/arm_cortexa8/u-boot.lds
diff --git a/board/omap1610inn/u-boot.lds b/cpu/arm_intcm/u-boot.lds
similarity index 96%
rename from board/omap1610inn/u-boot.lds
rename to cpu/arm_intcm/u-boot.lds
index 4d50f2c..55c9a38 100644
--- a/board/omap1610inn/u-boot.lds
+++ b/cpu/arm_intcm/u-boot.lds
@@ -27,16 +27,20 @@ ENTRY(_start)
SECTIONS
{
. = 0x00000000;
+
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm926ejs/start.o (.text)
- *(.text)
+ cpu/arm_intcm/start.o (.text)
+ *(.text)
}
+
. = ALIGN(4);
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
. = ALIGN(4);
.data : { *(.data) }
+
. = ALIGN(4);
.got : { *(.got) }
diff --git a/board/ixdp425/u-boot.lds b/cpu/ixp/u-boot.lds
similarity index 94%
rename from board/ixdp425/u-boot.lds
rename to cpu/ixp/u-boot.lds
index 7c287e1..85209ca 100644
--- a/board/ixdp425/u-boot.lds
+++ b/cpu/ixp/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd at denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -29,10 +29,10 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/ixp/start.o (.text)
- *(.text)
+ cpu/ixp/start.o(.text)
+ *(.text)
}
. = ALIGN(4);
diff --git a/board/omap730p2/u-boot.lds b/cpu/lh7a40x/u-boot.lds
similarity index 96%
rename from board/omap730p2/u-boot.lds
rename to cpu/lh7a40x/u-boot.lds
index 4d50f2c..a3bf530 100644
--- a/board/omap730p2/u-boot.lds
+++ b/cpu/lh7a40x/u-boot.lds
@@ -27,16 +27,20 @@ ENTRY(_start)
SECTIONS
{
. = 0x00000000;
+
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm926ejs/start.o (.text)
- *(.text)
+ cpu/lh7a40x/start.o (.text)
+ *(.text)
}
+
. = ALIGN(4);
.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+
. = ALIGN(4);
.data : { *(.data) }
+
. = ALIGN(4);
.got : { *(.got) }
diff --git a/board/pxa255_idp/u-boot.lds b/cpu/pxa/u-boot.lds
similarity index 96%
rename from board/pxa255_idp/u-boot.lds
rename to cpu/pxa/u-boot.lds
index fb4358b..77ab3c9 100644
--- a/board/pxa255_idp/u-boot.lds
+++ b/cpu/pxa/u-boot.lds
@@ -29,10 +29,10 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/pxa/start.o (.text)
- *(.text)
+ cpu/pxa/start.o (.text)
+ *(.text)
}
. = ALIGN(4);
diff --git a/board/mx1fs2/u-boot.lds b/cpu/s3c44b0/u-boot.lds
similarity index 96%
rename from board/mx1fs2/u-boot.lds
rename to cpu/s3c44b0/u-boot.lds
index d912d93..41ca3b4 100644
--- a/board/mx1fs2/u-boot.lds
+++ b/cpu/s3c44b0/u-boot.lds
@@ -19,7 +19,6 @@
* 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-littlearm", "elf32-littlearm", "elf32-littlearm")
@@ -30,9 +29,9 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
- cpu/arm920t/start.o (.text)
+ cpu/s3c44b0/start.o (.text)
*(.text)
}
diff --git a/board/assabet/u-boot.lds b/cpu/sa1100/u-boot.lds
similarity index 95%
rename from board/assabet/u-boot.lds
rename to cpu/sa1100/u-boot.lds
index bd97436..0c02e76 100644
--- a/board/assabet/u-boot.lds
+++ b/cpu/sa1100/u-boot.lds
@@ -1,7 +1,9 @@
/*
+ * (C) Copyright 2003-2004
+ * MontaVista Software, Inc.
+ *
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- * 2004 (c) MontaVista Software, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -30,7 +32,7 @@ SECTIONS
. = 0x00000000;
. = ALIGN(4);
- .text :
+ .text :
{
cpu/sa1100/start.o (.text)
*(.text)
@@ -45,7 +47,6 @@ SECTIONS
. = ALIGN(4);
.got : { *(.got) }
-
. = .;
__u_boot_cmd_start = .;
.u_boot_cmd : { *(.u_boot_cmd) }
--
1.6.1.3
More information about the U-Boot
mailing list