mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
Revert "Correct fixup relocation for mpc8260"
This reverts commit 5af61b2f4b
.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
928fe33b24
commit
96279ab4ca
6 changed files with 5 additions and 2 deletions
|
@ -55,6 +55,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
*(.text)
|
*(.text)
|
||||||
common/environment.o(.text)
|
common/environment.o(.text)
|
||||||
|
*(.fixup)
|
||||||
*(.got1)
|
*(.got1)
|
||||||
}
|
}
|
||||||
_etext = .;
|
_etext = .;
|
||||||
|
|
|
@ -69,6 +69,7 @@ SECTIONS
|
||||||
common/environment.o(.text)
|
common/environment.o(.text)
|
||||||
|
|
||||||
*(.text)
|
*(.text)
|
||||||
|
*(.fixup)
|
||||||
*(.got1)
|
*(.got1)
|
||||||
}
|
}
|
||||||
_etext = .;
|
_etext = .;
|
||||||
|
|
|
@ -55,6 +55,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
cpu/mpc8260/start.o (.text)
|
cpu/mpc8260/start.o (.text)
|
||||||
*(.text)
|
*(.text)
|
||||||
|
*(.fixup)
|
||||||
*(.got1)
|
*(.got1)
|
||||||
/*. = env_offset; */
|
/*. = env_offset; */
|
||||||
}
|
}
|
||||||
|
|
|
@ -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_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
|
PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
|
||||||
-mstring -mcpu=603e -mmultiple
|
-mstring -mcpu=603e -mmultiple
|
||||||
|
|
|
@ -55,6 +55,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
cpu/mpc8260/start.o (.text)
|
cpu/mpc8260/start.o (.text)
|
||||||
*(.text)
|
*(.text)
|
||||||
|
*(.fixup)
|
||||||
*(.got1)
|
*(.got1)
|
||||||
. = ALIGN(16);
|
. = ALIGN(16);
|
||||||
*(.rodata)
|
*(.rodata)
|
||||||
|
|
|
@ -86,7 +86,6 @@ typedef volatile unsigned char vu_char;
|
||||||
#define CONFIG_MPC8260 1
|
#define CONFIG_MPC8260 1
|
||||||
#endif
|
#endif
|
||||||
#include <asm/immap_8260.h>
|
#include <asm/immap_8260.h>
|
||||||
#define CONFIG_RELOC_FIXUP_WORKS
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_MPC86xx
|
#ifdef CONFIG_MPC86xx
|
||||||
#include <mpc86xx.h>
|
#include <mpc86xx.h>
|
||||||
|
|
Loading…
Reference in a new issue