summaryrefslogtreecommitdiff
path: root/board/amcc/canyonlands
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
committerWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
commitcd77dd109c4a439519a78c32eddc42bdebc7a61f (patch)
treec5534647cb1786044ef0f7e4ad4067725eddf11d /board/amcc/canyonlands
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
downloadu-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.bz2
Merge branch 'reloc'
Diffstat (limited to 'board/amcc/canyonlands')
-rw-r--r--board/amcc/canyonlands/u-boot-nand.lds1
-rw-r--r--board/amcc/canyonlands/u-boot.lds1
2 files changed, 0 insertions, 2 deletions
diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index d18c536..47c6bd9 100644
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/u-boot-nand.lds
@@ -62,7 +62,6 @@ SECTIONS
. = ALIGN(0x80000);
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/amcc/canyonlands/u-boot.lds b/board/amcc/canyonlands/u-boot.lds
index b768532..22fb8b8 100644
--- a/board/amcc/canyonlands/u-boot.lds
+++ b/board/amcc/canyonlands/u-boot.lds
@@ -69,7 +69,6 @@ SECTIONS
board/amcc/canyonlands/init.o (.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;