On Tue, Sep 17, 2013 at 09:52:18AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> ---
> common/filetype.c | 3 +++
> include/filetype.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/common/filetype.c b/common/filetype.c
> index 7507d85..59ea25a 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -35,6 +35,7 @@ static const struct filetype_str filetype_str[] = {
> [filetype_lzo_compressed] = { "lzo compressed", "lzo" },
> [filetype_lz4_compressed] = { "lz4 compressed", "lz4" },
> [filetype_arm_barebox] = { "arm barebox image", "arm-barebox" },
> + [filetype_arm_uboot] = { "arm u-boot image", "arm-u-boot" },
> [filetype_uimage] = { "U-Boot uImage", "u-boot" },
> [filetype_ubi] = { "UBI image", "ubi" },
> [filetype_jffs2] = { "JFFS2 image", "jffs2" },
> @@ -226,6 +227,8 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
>
> if (is_barebox_arm_head(_buf))
> return filetype_arm_barebox;
> + if (buf[15] == 0xdeadbeef)
> + return filetype_arm_uboot;
0xdeadbeef is such a widely used placeholder that we should use it for
filetype detection. Also, I don't think that U-Boot ever specified
0xdeadbeef at this offset as a fixed value. It could be changed without
notice.
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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
