diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-06 17:08:18 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-06 17:08:18 +0200 |
| commit | 87cb6862b94e342d6c99467e0dbb0d4f625cc7ef (patch) | |
| tree | 82c6530f0de6cc1e224cdc17458ab6a503cf072f /cpu/arm1136 | |
| parent | bccae9039e59ac09a776429119389a6a4e679fd7 (diff) | |
| download | blackbird-obmc-uboot-87cb6862b94e342d6c99467e0dbb0d4f625cc7ef.tar.gz blackbird-obmc-uboot-87cb6862b94e342d6c99467e0dbb0d4f625cc7ef.zip | |
Update make target for ARM supported boards.
Use lowlevel_init() instead of platformsetup() [rename].
Patch by Peter Pearse, 06 Oct 2005
Diffstat (limited to 'cpu/arm1136')
| -rw-r--r-- | cpu/arm1136/interrupts.c | 12 | ||||
| -rw-r--r-- | cpu/arm1136/start.S | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/cpu/arm1136/interrupts.c b/cpu/arm1136/interrupts.c index 23236dcb0f..6b1449e97a 100644 --- a/cpu/arm1136/interrupts.c +++ b/cpu/arm1136/interrupts.c @@ -32,7 +32,11 @@ #include <common.h> #include <asm/arch/bits.h> -#include <asm/arch/omap2420.h> + +#if !defined(CONFIG_INTEGRATOR) || ! defined(CONFIG_ARCH_CINTEGRATOR) +# include <asm/arch/omap2420.h> +#endif + #include <asm/proc-armv/ptrace.h> #define TIMER_LOAD_VAL 0 @@ -175,6 +179,9 @@ void do_irq (struct pt_regs *pt_regs) static ulong timestamp; static ulong lastinc; +#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR) +/* Use the IntegratorCP function from board/integratorcp.c */ +#else /* nothing really to do with interrupts, just starts up a counter. */ int interrupt_init (void) { @@ -189,7 +196,6 @@ int interrupt_init (void) return(0); } - /* * timer without interrupts */ @@ -281,7 +287,6 @@ unsigned long long get_ticks(void) { return get_timer(0); } - /* * This function is derived from PowerPC code (timebase clock frequency). * On ARM it returns the number of timer ticks per second. @@ -292,3 +297,4 @@ ulong get_tbclk (void) tbclk = CFG_HZ; return tbclk; } +#endif /* !Integrator/CP */ diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S index c3bf6e37e1..05c9128d84 100644 --- a/cpu/arm1136/start.S +++ b/cpu/arm1136/start.S @@ -210,7 +210,7 @@ cpu_init_crit: * basic memory. Go here to bump up clock rate and handle wake up conditions. */ mov ip, lr /* persevere link reg across call */ - bl platformsetup /* go setup pll,mux,memory */ + bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ /* @@ -397,6 +397,10 @@ arm1136_cache_flush: mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache mov pc, lr @ back to caller +#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR) +/* Use the IntegratorCP function from board/integratorcp/platform.S */ +#else + .align 5 .globl reset_cpu reset_cpu: @@ -408,3 +412,5 @@ _loop_forever: b _loop_forever rstctl: .word PM_RSTCTRL_WKUP + +#endif |
