mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Krzysztof Halasa <khc@pm.waw.pl>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: put a valid "barebox" signature in the header on big-endian systems.
Date: Sun, 6 May 2012 20:17:54 +0200	[thread overview]
Message-ID: <20120506181754.GA4141@pengutronix.de> (raw)
In-Reply-To: <m3397emhaw.fsf@intrepid.localdomain>

On Sat, May 05, 2012 at 11:47:19PM +0200, Krzysztof Halasa wrote:
> Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
> 
> diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h
> index 0dc3074..2c250e9 100644
> --- a/arch/arm/include/asm/barebox-arm-head.h
> +++ b/arch/arm/include/asm/barebox-arm-head.h
> @@ -24,8 +24,7 @@ static inline void barebox_arm_head(void)
>  		"1: b 1b\n"
>  		"1: b 1b\n"
>  #endif
> -		".word 0x65726162\n"			/* 'bare' */
> -		".word 0x00786f62\n"			/* 'box' */
> +		".asciz \"barebox\"\n"
>  		".word _text\n"				/* text base. If copied there,
>  							 * barebox can skip relocation

Does the barebox filetype detection need a fix aswell?

enum filetype file_detect_type(void *_buf)
{
        u32 *buf = _buf;
        u8 *buf8 = _buf;

        if (strncmp(buf8, "#!/bin/sh", 9) == 0)
                return filetype_sh;
        if (buf[8] == 0x65726162 && buf[9] == 0x00786f62)
                return filetype_arm_barebox;

This seems wrong on big endian systems.

Sascha

-- 
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

  reply	other threads:[~2012-05-06 18:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-05 21:47 Krzysztof Halasa
2012-05-06 18:17 ` Sascha Hauer [this message]
2012-05-06 20:19   ` Krzysztof Halasa
2012-05-10 12:30 ` Sascha Hauer
2012-05-12 21:38 ` Uwe Kleine-König
2012-05-12 23:56   ` Antony Pavlov
2012-05-13  0:17     ` Uwe Kleine-König
2012-05-13 10:05   ` Krzysztof Halasa
2012-05-13 12:20     ` 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=20120506181754.GA4141@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=khc@pm.waw.pl \
    /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