summaryrefslogtreecommitdiff
path: root/board/dave
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-01-13 15:04:37 +0100
committerStefan Roese <sr@denx.de>2008-01-13 15:04:37 +0100
commit8d79953d03e6c5b24215609997dafe4daa623cd6 (patch)
treecb9a4246cde2d32fa600461da008c7d59b57cf4b /board/dave
parent47cc23cbe9a669c510183f4f049bf703ef445f3b (diff)
parent2b2f43ed6a30ece77f76191c845ac95267daa31a (diff)
downloadu-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.zip
u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.gz
u-boot-imx-8d79953d03e6c5b24215609997dafe4daa623cd6.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/dave')
-rw-r--r--board/dave/B2/u-boot.lds2
-rw-r--r--board/dave/PPChameleonEVB/u-boot.lds4
2 files changed, 3 insertions, 3 deletions
diff --git a/board/dave/B2/u-boot.lds b/board/dave/B2/u-boot.lds
index e10ac43..8c10d47 100644
--- a/board/dave/B2/u-boot.lds
+++ b/board/dave/B2/u-boot.lds
@@ -53,6 +53,6 @@ SECTIONS
. = ALIGN(4);
__bss_start = .;
- .bss : { *(.bss) }
+ .bss (NOLOAD) : { *(.bss) }
_end = .;
}
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index 481d291..c437db6 100644
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
cpu/ppc4xx/start.o (.text)
cpu/ppc4xx/traps.o (.text)
cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/serial.o (.text)
+ cpu/ppc4xx/4xx_uart.o (.text)
cpu/ppc4xx/cpu_init.o (.text)
cpu/ppc4xx/speed.o (.text)
cpu/ppc4xx/4xx_enet.o (.text)
@@ -136,7 +136,7 @@ SECTIONS
__init_end = .;
__bss_start = .;
- .bss :
+ .bss (NOLOAD) :
{
*(.sbss) *(.scommon)
*(.dynbss)