diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:44:04 +0200 |
| commit | 0740ac26f4e590bf5b4e7b9a9886208dc2dacb32 (patch) | |
| tree | 5d18fcb91d491f602c17c550af70a9a092b883f8 /cpu/mcf5445x | |
| parent | af577da58642b81eb94067e3d9e9dc6998cd620d (diff) | |
| parent | 47bf9c71ae838305a3ea3161af8d14e6f3fc2c82 (diff) | |
| download | u-boot-imx-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.zip u-boot-imx-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.tar.gz u-boot-imx-0740ac26f4e590bf5b4e7b9a9886208dc2dacb32.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'cpu/mcf5445x')
| -rw-r--r-- | cpu/mcf5445x/config.mk | 6 | ||||
| -rw-r--r-- | cpu/mcf5445x/cpu_init.c | 2 | ||||
| -rw-r--r-- | cpu/mcf5445x/start.S | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cpu/mcf5445x/config.mk b/cpu/mcf5445x/config.mk index 88433f2..67efa07 100644 --- a/cpu/mcf5445x/config.mk +++ b/cpu/mcf5445x/config.mk @@ -29,3 +29,9 @@ PLATFORM_CPPFLAGS += -mcpu=54455 -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/mcf5445x/cpu_init.c b/cpu/mcf5445x/cpu_init.c index 585216d..e07748b 100644 --- a/cpu/mcf5445x/cpu_init.c +++ b/cpu/mcf5445x/cpu_init.c @@ -110,7 +110,7 @@ void cpu_init_f(void) */ int cpu_init_r(void) { -#ifdef CONFIG_MCFTMR +#ifdef CONFIG_MCFRTC volatile rtc_t *rtc = (volatile rtc_t *)(CFG_MCFRTC_BASE); volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended; diff --git a/cpu/mcf5445x/start.S b/cpu/mcf5445x/start.S index 3241b27..89ec7bc 100644 --- a/cpu/mcf5445x/start.S +++ b/cpu/mcf5445x/start.S @@ -253,7 +253,7 @@ clear_bss: /* exception code */ .globl _fault _fault: - jmp _fault + bra _fault .globl _exc_handler _exc_handler: |