* [PATCH 1/1] arm: armlinux: get the architecture before shutdown barebox
@ 2012-09-12 14:12 Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:25 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-09-12 14:12 UTC (permalink / raw)
To: barebox
As we may try to get it from the env.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/lib/armlinux.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 9f9dea8..191274e 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -264,6 +264,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
setup_tags(initrd_address, initrd_size, swap);
params = armlinux_bootparams;
}
+ architecture = armlinux_get_architecture();
shutdown_barebox();
if (swap) {
@@ -273,8 +274,6 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
__asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg));
}
- architecture = armlinux_get_architecture();
-
#ifdef CONFIG_THUMB2_BAREBOX
__asm__ __volatile__ (
"mov r0, #0\n"
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] arm: armlinux: get the architecture before shutdown barebox
2012-09-12 14:12 [PATCH 1/1] arm: armlinux: get the architecture before shutdown barebox Jean-Christophe PLAGNIOL-VILLARD
@ 2012-09-12 15:25 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-09-12 15:25 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Wed, Sep 12, 2012 at 04:12:11PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> As we may try to get it from the env.
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Applied, thanks
Sascha
> ---
> arch/arm/lib/armlinux.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
> index 9f9dea8..191274e 100644
> --- a/arch/arm/lib/armlinux.c
> +++ b/arch/arm/lib/armlinux.c
> @@ -264,6 +264,7 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
> setup_tags(initrd_address, initrd_size, swap);
> params = armlinux_bootparams;
> }
> + architecture = armlinux_get_architecture();
>
> shutdown_barebox();
> if (swap) {
> @@ -273,8 +274,6 @@ void start_linux(void *adr, int swap, unsigned long initrd_address,
> __asm__ __volatile__("mcr p15, 0, %0, c1, c0" :: "r" (reg));
> }
>
> - architecture = armlinux_get_architecture();
> -
> #ifdef CONFIG_THUMB2_BAREBOX
> __asm__ __volatile__ (
> "mov r0, #0\n"
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-12 15:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-12 14:12 [PATCH 1/1] arm: armlinux: get the architecture before shutdown barebox Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:25 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox