diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-15 16:13:48 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-15 16:24:37 +0200 |
| commit | cd6cc3440f3f8166b0ceda3c510786d8fcd64dff (patch) | |
| tree | 821c9375e75a1876956770398ab1d59a784c333a /arch/arm/cpu/sa1100 | |
| parent | b4ee1491b917951c0f57e18fd816a4211f5829d4 (diff) | |
| download | blackbird-obmc-uboot-cd6cc3440f3f8166b0ceda3c510786d8fcd64dff.tar.gz blackbird-obmc-uboot-cd6cc3440f3f8166b0ceda3c510786d8fcd64dff.zip | |
arm: move reset_cpu from start.S into cpu.c
CPUs arm946es and sa1100 both define the reset_cpu()
function in their start.S file. Move this cpu-specific code
into cpu.c so that start.S only contains ARM generic code.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'arch/arm/cpu/sa1100')
| -rw-r--r-- | arch/arm/cpu/sa1100/cpu.c | 14 | ||||
| -rw-r--r-- | arch/arm/cpu/sa1100/start.S | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index 6651898de2..4c9752a1c8 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -17,6 +17,7 @@ #include <common.h> #include <command.h> #include <asm/system.h> +#include <asm/io.h> #ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR; @@ -52,3 +53,16 @@ static void cache_flush (void) asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i)); } + +#define RST_BASE 0x90030000 +#define RSRR 0x00 +#define RCSR 0x04 + +__attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused))) +{ + /* repeat endlessly */ + while (1) { + writel(0, RST_BASE + RCSR); + writel(1, RST_BASE + RSRR); + } +} diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index bf80937a7c..472a595ad8 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -337,13 +337,3 @@ fiq: bl do_fiq #endif - - .align 5 -.globl reset_cpu -reset_cpu: - ldr r0, RST_BASE - mov r1, #0x0 @ set bit 3-0 ... - str r1, [r0, #RCSR] @ ... to clear in RCSR - mov r1, #0x1 - str r1, [r0, #RSRR] @ and perform reset - b reset_cpu @ silly, but repeat endlessly |
