mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 07/12] ARM: replace cleanup_before_linux with the generic shutdown_barebox function
Date: Tue, 30 Mar 2010 13:06:50 +0200	[thread overview]
Message-ID: <1269947215-18214-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1269947215-18214-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/cpu.c            |   12 +++++-------
 arch/arm/include/asm/common.h |    2 +-
 arch/arm/lib/armlinux.c       |    6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index 1b8fc97..a5e2fe2 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
  *
diff --git a/arch/arm/include/asm/common.h b/arch/arm/include/asm/common.h
index da84fa5..9afcff7 100644
--- a/arch/arm/include/asm/common.h
+++ b/arch/arm/include/asm/common.h
@@ -1 +1 @@
-/* nothing */
+#define ARCH_SHUTDOWN
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index ec9ad8e..f8b8520 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -192,7 +192,7 @@ int do_bootm_linux(struct image_data *data)
 	/* we assume that the kernel is in place */
 	printf("\nStarting kernel ...\n\n");
 
-	cleanup_before_linux();
+	shutdown_barebox();
 	theKernel (0, armlinux_architecture, armlinux_bootparams);
 
 	return -1;
@@ -287,7 +287,7 @@ static int do_bootz(struct command *cmdtp, int argc, char *argv[])
 #endif
 	setup_end_tag();
 
-	cleanup_before_linux();
+	shutdown_barebox();
 	theKernel(0, armlinux_architecture, armlinux_bootparams);
 
 	return 0;
@@ -329,7 +329,7 @@ static int do_bootu(struct command *cmdtp, int argc, char *argv[])
 	setup_commandline_tag(commandline);
 	setup_end_tag();
 
-	cleanup_before_linux();
+	shutdown_barebox();
 	theKernel(0, armlinux_architecture, armlinux_bootparams);
 
 	return 1;
-- 
1.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2010-03-30 11:07 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-30 11:06 More patches for next merge window Sascha Hauer
2010-03-30 11:06 ` [PATCH 01/12] make reset_cpu a __noreturn function Sascha Hauer
2010-03-30 11:06 ` [PATCH 02/12] make panic and hang __noreturn functions Sascha Hauer
2010-03-30 11:06 ` [PATCH 03/12] introduce a arch_shutdown call and call it from shutdown_barebox Sascha Hauer
2010-03-30 11:06 ` [PATCH 04/12] blackfin: implement arch_shutdown call Sascha Hauer
2010-03-30 11:06 ` [PATCH 05/12] go command: shutdown barebox before calling an application Sascha Hauer
2010-03-30 11:06 ` [PATCH 06/12] remove now unused arch_execute Sascha Hauer
2010-03-30 11:06 ` Sascha Hauer [this message]
2010-03-30 11:06 ` [PATCH 08/12] pass arguments to dma_* as unsigned long as the kernel does Sascha Hauer
2010-03-30 11:06 ` [PATCH 09/12] ARM: Add a wrapper around dma_* functions Sascha Hauer
2010-03-30 11:06 ` [PATCH 10/12] add l2x0 cache support Sascha Hauer
2010-03-30 11:06 ` [PATCH 11/12] pcm043: enable l2x0 cache Sascha Hauer
2010-03-30 11:06 ` [PATCH 12/12] netx eth driver: remove local definition of ARRAY_SIZE Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1269947215-18214-8-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox