From 5af61b2f4b838a05f79be274f3e5a66edd2d9c96 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 3 Jul 2007 00:34:44 -0600
Subject: [PATCH] Correct fixup relocation for mpc8260
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
board/cogent/u-boot.lds | 1 -
board/hymod/u-boot.lds | 1 -
board/rsdproto/u-boot.lds | 1 -
cpu/mpc8260/config.mk | 2 +-
cpu/mpc8260/u-boot.lds | 1 -
include/common.h | 1 +
6 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds
index 5ce2694cbf..d87a39b249 100644
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
{
*(.text)
common/environment.o(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 337a3954d2..9bf0f0938a 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -69,7 +69,6 @@ SECTIONS
common/environment.o(.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 70fc3a5d27..9bd6248095 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
{
cpu/mpc8260/start.o (.text)
*(.text)
- *(.fixup)
*(.got1)
/*. = env_offset; */
}
diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk
index 683b6fbf2b..d401e4ca04 100644
--- a/cpu/mpc8260/config.mk
+++ b/cpu/mpc8260/config.mk
@@ -21,7 +21,7 @@
# MA 02111-1307 USA
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
-mstring -mcpu=603e -mmultiple
diff --git a/cpu/mpc8260/u-boot.lds b/cpu/mpc8260/u-boot.lds
index 3e84f234d7..b8abc17d41 100644
--- a/cpu/mpc8260/u-boot.lds
+++ b/cpu/mpc8260/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
{
cpu/mpc8260/start.o (.text)
*(.text)
- *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/include/common.h b/include/common.h
index 4c50053c02..b224e06976 100644
--- a/include/common.h
+++ b/include/common.h
@@ -83,6 +83,7 @@ typedef volatile unsigned char vu_char;
#define CONFIG_MPC8260 1
#endif
#include <asm/immap_8260.h>
+#define CONFIG_RELOC_FIXUP_WORKS
#endif
#ifdef CONFIG_MPC86xx
#include <mpc86xx.h>
--
2.39.5