diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-04-02 12:07:48 +0200 |
commit | c1894b4bc7ae58f74b01e4a31b267680c721b727 (patch) | |
tree | ab56e162ebedc90ee6c88e286ab20ccb066551f3 /arch/arm/cpu/cpu.c | |
parent | c6cdbe71c9614d2fc409d4d538e80a53a4bcdc32 (diff) | |
parent | e3b204668525636ee1c0de4d4869822b050d7c69 (diff) | |
download | barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.gz barebox-c1894b4bc7ae58f74b01e4a31b267680c721b727.tar.xz |
Merge branch 'pu' into next
Diffstat (limited to 'arch/arm/cpu/cpu.c')
-rw-r--r-- | arch/arm/cpu/cpu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index 1b8fc970de..a5e2fe2a07 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -132,18 +132,16 @@ int icache_status (void) } /** - * Prepare a "clean" CPU for Linux to run + * Disable MMU and D-cache, flush caches * @return 0 (always) * - * This function is called by the generic barebox part just before we call - * Linux. It prepares the processor for Linux. + * This function is called by shutdown_barebox to get a clean + * memory/cache state. */ -int cleanup_before_linux (void) +void arch_shutdown(void) { int i; - shutdown_barebox(); - #ifdef CONFIG_MMU mmu_disable(); #endif @@ -151,8 +149,8 @@ int cleanup_before_linux (void) /* flush I/D-cache */ i = 0; asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i)); - return 0; } + /** * @page arm_boot_preparation Linux Preparation on ARM * |