Re: [PATCH 02/22] filetype: Add code to detect i.MX image v1

[Roland Hieber <r.hieber@pengutronix.de>]

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