From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] arm: armlinux: get the architecture before shutdown barebox
Date: Wed, 12 Sep 2012 17:25:46 +0200 [thread overview]
Message-ID: <20120912152546.GW6180@pengutronix.de> (raw)
In-Reply-To: <1347459131-16836-1-git-send-email-plagnioj@jcrosoft.com>
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
prev parent reply other threads:[~2012-09-12 15:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 14:12 Jean-Christophe PLAGNIOL-VILLARD
2012-09-12 15:25 ` Sascha Hauer [this message]
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=20120912152546.GW6180@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=plagnioj@jcrosoft.com \
/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