From: Roland Hieber <r.hieber@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 02/22] filetype: Add code to detect i.MX image v1
Date: Tue, 21 Aug 2018 12:07:28 +0200 [thread overview]
Message-ID: <20180821100728.imn64ysjyqfrf4zv@pengutronix.de> (raw)
In-Reply-To: <20180821062603.17393-3-andrew.smirnov@gmail.com>
Hello Andrey,
On Mon, Aug 20, 2018 at 11:25:43PM -0700, Andrey Smirnov wrote:
> Modify file_detect_type() and add code needed to be able to detect
> i.MX boot images with v1 header.
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> common/filetype.c | 7 +++++++
> include/filetype.h | 1 +
> 2 files changed, 8 insertions(+)
>
> diff --git a/common/filetype.c b/common/filetype.c
> index c5f2384a6..f68a83bec 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -29,6 +29,8 @@
> #include <image-sparse.h>
> #include <elf.h>
>
> +#include <../mach-imx/include/mach/imx-header.h>
This fails at least on ARCH=sandbox:
common/filetype.c:32:10: fatal error: ../mach-imx/include/mach/imx-header.h: No such file or directory
#include <../mach-imx/include/mach/imx-header.h>
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I guess it could be solved with an #ifdef ARCH_IMX.
- Roland
> +
> struct filetype_str {
> const char *name; /* human readable filetype */
> const char *shortname; /* short string without spaces for shell scripts */
> @@ -71,6 +73,7 @@ static const struct filetype_str filetype_str[] = {
> [filetype_android_sparse] = { "Android sparse image", "sparse" },
> [filetype_arm64_linux_image] = { "ARM aarch64 Linux image", "aarch64-linux" },
> [filetype_elf] = { "ELF", "elf" },
> + [filetype_imx_image_v1] = { "i.MX image (v1)", "imx-image-v1" },
> };
>
> const char *file_type_to_string(enum filetype f)
> @@ -250,6 +253,7 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
> const u64 *buf64 = _buf;
> const u8 *buf8 = _buf;
> const u16 *buf16 = _buf;
> + const struct imx_flash_header *imx_flash_header = _buf;
> enum filetype type;
>
> if (bufsize < 9)
> @@ -361,6 +365,9 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
> if (strncmp(buf8, ELFMAG, 4) == 0)
> return filetype_elf;
>
> + if (imx_flash_header->dcd_barker == DCD_BARKER)
> + return filetype_imx_image_v1;
> +
> return filetype_unknown;
> }
>
> diff --git a/include/filetype.h b/include/filetype.h
> index 237ed3fbe..e2df5fabf 100644
> --- a/include/filetype.h
> +++ b/include/filetype.h
> @@ -43,6 +43,7 @@ enum filetype {
> filetype_android_sparse,
> filetype_arm64_linux_image,
> filetype_elf,
> + filetype_imx_image_v1,
> filetype_max,
> };
>
> --
> 2.17.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-08-21 10:07 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 6:25 [PATCH 00/22] i.MX BBU improvements and bugfixes Andrey Smirnov
2018-08-21 6:25 ` [PATCH 01/22] ARM: i.MX: bbu: Remove unused define Andrey Smirnov
2018-08-21 6:25 ` [PATCH 02/22] filetype: Add code to detect i.MX image v1 Andrey Smirnov
2018-08-21 10:07 ` Roland Hieber [this message]
2018-08-21 20:23 ` Andrey Smirnov
2018-08-23 9:33 ` Roland Hieber
2018-08-23 21:01 ` Andrey Smirnov
2018-08-21 6:25 ` [PATCH 03/22] filetype: Add code to detect i.MX image v2 Andrey Smirnov
2018-08-21 6:25 ` [PATCH 04/22] ARM: i.MX: bbu: Move inner-image type check Andrey Smirnov
2018-08-22 6:49 ` Sascha Hauer
2018-08-22 6:52 ` Sascha Hauer
2018-08-23 0:06 ` Andrey Smirnov
2018-08-23 6:44 ` Sascha Hauer
2018-08-21 6:25 ` [PATCH 05/22] ARM: i.MX: bbu: Drop IMX_INTERNAL_FLAG_NAND Andrey Smirnov
2018-08-21 6:25 ` [PATCH 06/22] ARM: i.MX: bbu: Consolidate vairous update helpers Andrey Smirnov
2018-08-22 6:52 ` Sascha Hauer
2018-08-23 0:07 ` Andrey Smirnov
2018-08-21 6:25 ` [PATCH 07/22] ARM: i.MX: bbu: Simplify imx53_bbu_internal_nand_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 08/22] ARM: i.MX: bbu: Constify all 'devicefile' arguments Andrey Smirnov
2018-08-21 6:25 ` [PATCH 09/22] ARM: i.MX: bbu: Detect which platforms need v2 i.MX header Andrey Smirnov
2018-08-21 6:25 ` [PATCH 10/22] ARM: i.MX: bbu: Alias imx5*_bbu_internal_mmc_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 11/22] ARM: i.MX: bbu: Alias imx5*_bbu_internal_spi_i2c_register_handler() Andrey Smirnov
2018-08-21 6:25 ` [PATCH 12/22] ARM: i.MX: bbu: Move protect code into a separate routine Andrey Smirnov
2018-08-21 6:25 ` [PATCH 13/22] ARM: i.MX: bbu: Adjust FLASH_HEADER_OFFSET_MMC for i.MX8MQ Andrey Smirnov
2018-08-21 6:25 ` [PATCH 14/22] ARM: i.MX: bbu: Add support for SPI/I2C on VFxxx Andrey Smirnov
2018-08-21 6:25 ` [PATCH 15/22] ARM: i.MX: zii-vf610-dev-rev-b/c: Add support for BBU on SPI-NOR Andrey Smirnov
2018-08-21 6:25 ` [PATCH 16/22] ARM: i.MX: bbu: Add support for MMC on i.MX8MQ Andrey Smirnov
2018-08-21 6:25 ` [PATCH 17/22] ARM: nxp-imx8mq-evk: Add eMMC BBU configuration Andrey Smirnov
2018-08-21 6:25 ` [PATCH 18/22] ARM: i.MX: bbu: Adjust error code check for pwrite() Andrey Smirnov
2018-08-22 7:01 ` Sascha Hauer
2018-08-23 0:16 ` Andrey Smirnov
2018-08-21 6:26 ` [PATCH 19/22] bbu: Remove logical negation in barebox_update_handler_exists() Andrey Smirnov
2018-08-22 7:09 ` Sascha Hauer
2018-08-23 0:01 ` Andrey Smirnov
2018-08-23 4:43 ` Sam Ravnborg
2018-08-23 6:42 ` Sascha Hauer
2018-08-23 6:48 ` Andrey Smirnov
2018-08-21 6:26 ` [PATCH 20/22] block: Do not ignore error in blk->ops->write() Andrey Smirnov
2018-08-21 6:26 ` [PATCH 21/22] bbu: Report update failures explicitly Andrey Smirnov
2018-08-21 6:26 ` [PATCH 22/22] bbu: command: Make sure specified update handler exists Andrey Smirnov
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=20180821100728.imn64ysjyqfrf4zv@pengutronix.de \
--to=r.hieber@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/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