summaryrefslogtreecommitdiff
path: root/cpu/mcf547x_8x
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-13 14:44:12 +0200
committerWolfgang Denk <wd@denx.de>2008-07-13 14:44:12 +0200
commitc90d115913a921c7548ad6eaaa0e13d4f484334c (patch)
tree324cbb51ec8d0e8047bbce13d5f9900da2db1cbe /cpu/mcf547x_8x
parentdc42c7c08000f97651b763ab5b614e5f74c443ee (diff)
parent0740ac26f4e590bf5b4e7b9a9886208dc2dacb32 (diff)
downloadu-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.zip
u-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.tar.gz
u-boot-imx-c90d115913a921c7548ad6eaaa0e13d4f484334c.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu/mcf547x_8x')
-rw-r--r--cpu/mcf547x_8x/config.mk6
-rw-r--r--cpu/mcf547x_8x/start.S2
2 files changed, 7 insertions, 1 deletions
diff --git a/cpu/mcf547x_8x/config.mk b/cpu/mcf547x_8x/config.mk
index e5f4385..567b281 100644
--- a/cpu/mcf547x_8x/config.mk
+++ b/cpu/mcf547x_8x/config.mk
@@ -29,3 +29,9 @@ PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC
else
PLATFORM_CPPFLAGS += -m5407 -fPIC
endif
+
+ifneq (,$(findstring -linux-,$(shell $(CC) --version)))
+ifneq (,$(findstring GOT,$(shell $(LD) --help)))
+PLATFORM_LDFLAGS += --got=single
+endif
+endif
diff --git a/cpu/mcf547x_8x/start.S b/cpu/mcf547x_8x/start.S
index 8b8708d..87355f9 100644
--- a/cpu/mcf547x_8x/start.S
+++ b/cpu/mcf547x_8x/start.S
@@ -259,7 +259,7 @@ clear_bss:
/* exception code */
.globl _fault
_fault:
- jmp _fault
+ bra _fault
.globl _exc_handler
_exc_handler: