V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Albert ARIBAUD 2014-04-15 16:13:48 +02:00
parent b4ee1491b9
commit cd6cc3440f
4 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/cpu/arm946es/cpu.c
View File

@ -16,6 +16,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h>
static void cache_flush(void); static void cache_flush(void);
@ -51,3 +52,15 @@ static void cache_flush (void)
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i)); asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i));
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i)); asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i));
} }
#ifndef CONFIG_INTEGRATOR
__attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
{
writew(0x0, 0xfffece10);
writew(0x8, 0xfffece10);
for (;;)
;
}
#endif /* #ifdef CONFIG_INTEGRATOR */

23
arch/arm/cpu/arm946es/start.S
View File

@ -320,26 +320,3 @@ fiq:
bl do_fiq bl do_fiq
#endif #endif
# ifdef CONFIG_INTEGRATOR
/* Satisfied by general board level routine */
#else
.align 5
.globl reset_cpu
reset_cpu:
ldr r1, rstctl1 /* get clkm1 reset ctl */
mov r3, #0x0
strh r3, [r1] /* clear it */
mov r3, #0x8
strh r3, [r1] /* force dsp+arm reset */
_loop_forever:
b _loop_forever
rstctl1:
.word 0xfffece10
#endif /* #ifdef CONFIG_INTEGRATOR */

14
arch/arm/cpu/sa1100/cpu.c
View File

@ -17,6 +17,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h>
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -52,3 +53,16 @@ static void cache_flush (void)
asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i)); 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);
}
}

10
arch/arm/cpu/sa1100/start.S
View File

@ -337,13 +337,3 @@ fiq:
bl do_fiq bl do_fiq
#endif #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