mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/7] filetype: add new filetype for SoCFPGA xload image
Date: Thu, 18 Aug 2016 08:23:10 +0200	[thread overview]
Message-ID: <20160818062310.GB20657@pengutronix.de> (raw)
In-Reply-To: <1470746252-3146-1-git-send-email-s.trumtrar@pengutronix.de>

On Tue, Aug 09, 2016 at 02:37:26PM +0200, Steffen Trumtrar wrote:
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  common/filetype.c  | 4 ++++
>  include/filetype.h | 1 +
>  2 files changed, 5 insertions(+)

Applied 1 and 3-7.

Sascha

> 
> diff --git a/common/filetype.c b/common/filetype.c
> index a8666a1439df..4728f877c975 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -61,6 +61,7 @@ static const struct filetype_str filetype_str[] = {
>  	[filetype_xz_compressed] = { "XZ compressed", "xz" },
>  	[filetype_exe] = { "MS-DOS executable", "exe" },
>  	[filetype_mxs_bootstream] = { "Freescale MXS bootstream", "mxsbs" },
> +	[filetype_socfpga_xload] = { "SoCFPGA prebootloader image", "socfpga-xload" },
>  };
>  
>  const char *file_type_to_string(enum filetype f)
> @@ -294,6 +295,9 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
>  	if (le32_to_cpu(buf[5]) == 0x504d5453)
>  		return filetype_mxs_bootstream;
>  
> +	if (buf[16] == 0x31305341)
> +		return filetype_socfpga_xload;
> +
>  	if (is_barebox_arm_head(_buf))
>  		return filetype_arm_barebox;
>  	if (buf[9] == 0x016f2818 || buf[9] == 0x18286f01)
> diff --git a/include/filetype.h b/include/filetype.h
> index e87ca174a89d..cde73c1170c6 100644
> --- a/include/filetype.h
> +++ b/include/filetype.h
> @@ -36,6 +36,7 @@ enum filetype {
>  	filetype_exe,
>  	filetype_xz_compressed,
>  	filetype_mxs_bootstream,
> +	filetype_socfpga_xload,
>  	filetype_max,
>  };
>  
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> 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

      parent reply	other threads:[~2016-08-18  6:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-09 12:37 Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 2/7] ARM: socfpga: defconfig: add bootstrap_devfs Steffen Trumtrar
2016-08-09 17:48   ` Trent Piepho
2016-08-10  6:14     ` Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 3/7] ARM: socfpga: xload: support more qspi partitions Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 4/7] socfpga: remove dt entries that are upstream Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 5/7] ARM: socfpga: socrates: set alias for ethernet0 Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 6/7] ARM: socfpga: socrates: add qspi partitions Steffen Trumtrar
2016-08-09 12:37 ` [PATCH 7/7] ARM: socfpga: socrates: register bbu handlers Steffen Trumtrar
2016-08-18  6:23 ` 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=20160818062310.GB20657@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.trumtrar@pengutronix.de \
    /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