Hi Joacim,
On Tue, Mar 08, 2022 at 05:08:00PM +0100, Joacim Zetterling wrote:
> This functionality extend the IMX image build script with a support
> for generating QSPI boot images.
>
> A QSPI boot image need device configuration parameters located at
> an offset of 0x400 in the IVT section. The configuration parameters
> are stored in a 512 byte bin file which will be included in the
> final boot image. The boot image parameters comes from the board
> flash header imxcfg file.
>
> The QSPI configuration parameters are described in the reference
> manual for the specific target.
>
> Signed-off-by: Joacim Zetterling <joacim.zetterling@xxxxxxxxxxxx>
> ---
> arch/arm/mach-imx/include/mach/imx-header.h | 2 +
> scripts/imx/imx-image.c | 25 ++++++++
> scripts/imx/imx.c | 67 ++++++++++++++++++++-
> 3 files changed, 93 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-imx/include/mach/imx-header.h b/arch/arm/mach-imx/include/mach/imx-header.h
> index 8e968e6efba3..a58deb8d864e 100644
> --- a/arch/arm/mach-imx/include/mach/imx-header.h
> +++ b/arch/arm/mach-imx/include/mach/imx-header.h
> @@ -118,6 +118,8 @@ struct config_data {
> char *signed_hdmi_firmware_file;
> int encrypt_image;
> size_t dek_size;
> + uint32_t bb_cfg_ofs;
> + char *bb_cfg_file;
> };
>
> #define MAX_RECORDS_DCD_V2 1024
> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index 439912a805dc..b8ae63ad9400 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -951,6 +951,31 @@ int main(int argc, char *argv[])
> exit(1);
> }
>
> + /*
> + * The boot ROM expects a 512-byte configuration parameters area for
> + * some devices (like the FlexSPI NOR flash) to be present an defined
> + * offset in the image ivt section (0x400 for the FlexSPI NOR).
> + */
> + if (data.bb_cfg_file) {
> + size_t bb_cfg_file_size = 512;
> + char *bb_cfg;
> +
> + bb_cfg = calloc(512, sizeof(char));
> + if (!bb_cfg)
> + exit(1);
The buffer you are allocating here is not used...
> +
> + bb_cfg = read_file(data.bb_cfg_file, &bb_cfg_file_size);
...the pointer is directly overwritten with the buffer that read_file returns.
You should check the return value of read_file.
Anyway, specifying filenames in config files doesn't work properly. When
you are building out of tree then imx-image will look for the file
relative to $(objtree), but the file really is relative to $(srctree).
In other tools we usually pass filenames via a command line option, see
for example:
images/Makefile.mvebu:43:BINHDR_start_lenovo_ix4_300d.pblb.mvebu1img = $(board)/lenovo-ix4-300d/binary.0
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
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
