summaryrefslogtreecommitdiff
path: root/board/xes
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/xes
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
Merge branch 'reloc'
Diffstat (limited to 'board/xes')
-rw-r--r--board/xes/xpedite1000/u-boot.lds1
-rw-r--r--board/xes/xpedite1000/u-boot.lds.debug1
-rw-r--r--board/xes/xpedite5170/config.mk2
-rw-r--r--board/xes/xpedite5200/config.mk2
-rw-r--r--board/xes/xpedite5370/config.mk2
5 files changed, 0 insertions, 8 deletions
diff --git a/board/xes/xpedite1000/u-boot.lds b/board/xes/xpedite1000/u-boot.lds
index 46b52fc5359..73f65d61b3e 100644
--- a/board/xes/xpedite1000/u-boot.lds
+++ b/board/xes/xpedite1000/u-boot.lds
@@ -79,7 +79,6 @@ SECTIONS
lib_generic/zlib.o (.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index 68cd72d12dc..d00834eef37 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -71,7 +71,6 @@ SECTIONS
/* common/env_embedded.o(.text) */
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/xes/xpedite5170/config.mk b/board/xes/xpedite5170/config.mk
index 77c5785bb7b..1abae973f03 100644
--- a/board/xes/xpedite5170/config.mk
+++ b/board/xes/xpedite5170/config.mk
@@ -25,5 +25,3 @@
# XPedite5170
#
TEXT_BASE = 0xfff00000
-
-PLATFORM_RELFLAGS += -mrelocatable
diff --git a/board/xes/xpedite5200/config.mk b/board/xes/xpedite5200/config.mk
index fbfbc2b5a74..0761579d9d6 100644
--- a/board/xes/xpedite5200/config.mk
+++ b/board/xes/xpedite5200/config.mk
@@ -27,5 +27,3 @@
ifndef TEXT_BASE
TEXT_BASE = 0xfff80000
endif
-
-PLATFORM_CPPFLAGS += -mrelocatable
diff --git a/board/xes/xpedite5370/config.mk b/board/xes/xpedite5370/config.mk
index 7b8d06b1578..995def8759f 100644
--- a/board/xes/xpedite5370/config.mk
+++ b/board/xes/xpedite5370/config.mk
@@ -27,5 +27,3 @@
ifndef TEXT_BASE
TEXT_BASE = 0xfff80000
endif
-
-PLATFORM_RELFLAGS += -mrelocatable