minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Correct fixup relocation for MPC5xxx"

Browse Source 
This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely 2007-11-15 08:24:32 -07:00
parent 139365fbe5
commit e15633888a
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/mpc5xxx/config.mk
View File

@ -21,7 +21,7 @@
# MA 02111-1307 USA # MA 02111-1307 USA
# #
PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \
-mstring -mcpu=603e -mmultiple -mstring -mcpu=603e -mmultiple

1
cpu/mpc5xxx/u-boot-customlayout.lds
View File

@ -66,6 +66,7 @@ SECTIONS
common/environment.o (.ppcenv) common/environment.o (.ppcenv)
*(.text) *(.text)
*(.fixup)
*(.got1) *(.got1)
. = ALIGN(16); . = ALIGN(16);
*(.rodata) *(.rodata)

1
cpu/mpc5xxx/u-boot.lds
View File

@ -55,6 +55,7 @@ SECTIONS
{ {
cpu/mpc5xxx/start.o (.text) cpu/mpc5xxx/start.o (.text)
*(.text) *(.text)
*(.fixup)
*(.got1) *(.got1)
. = ALIGN(16); . = ALIGN(16);
*(.rodata) *(.rodata)

1
include/common.h
View File

@ -66,7 +66,6 @@ typedef volatile unsigned char vu_char;
#define CONFIG_RELOC_FIXUP_WORKS #define CONFIG_RELOC_FIXUP_WORKS
#elif defined(CONFIG_MPC5xxx) #elif defined(CONFIG_MPC5xxx)
#include <mpc5xxx.h> #include <mpc5xxx.h>
#define CONFIG_RELOC_FIXUP_WORKS
#elif defined(CONFIG_MPC512X) #elif defined(CONFIG_MPC512X)
#include <mpc512x.h> #include <mpc512x.h>
#include <asm/immap_512x.h> #include <asm/immap_512x.h>