spl: Set spl_image->fdt_addr pointer for full fitImage configuration
PATCH 1/1 spl: Set spl_image->fdt_addr pointer for full fitImage configuration
Set the spl_image->fdt_addr pointer both for simple fitImage configuration as well as full fitImage configuration, to let spl_perform_fixups() access the DT and perform modifications to it if necessary.
Signed-off-by Marek Vasut <[email protected]>
Cc Tom Rini <[email protected]>
--- common/spl/spl.c | 4 +++- include/spl.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
common/spl/spl.c +3 -1
@@ -195,10 +195,12 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,#ifdef CONFIG_SPL_FIT_SIGNATURE images.verify =1 ;#endif -fit_image_load (&images, (ulong )header, + ret =fit_image_load (&images, (ulong )header, &fit_uname_fdt, &fit_uname_config,IH_ARCH_DEFAULT ,IH_TYPE_FLATDT ,-1 ,FIT_LOAD_OPTIONAL , &dt_data, &dt_len); +if (ret >=0 ) + spl_image->fdt_addr = (void *)dt_data; conf_noffset =fit_conf_get_node ((const void *)header, fit_uname_config);
include/spl.h +1 -1
@@ -67,7 +67,7 @@ struct spl_image_info {u8 os;uintptr_t load_addr;uintptr_t entry_point; -#if CONFIG_IS_ENABLED (LOAD_FIT ) +#if CONFIG_IS_ENABLED (LOAD_FIT ) ||CONFIG_IS_ENABLED (LOAD_FIT_FULL )void *fdt_addr;#endif u32 boot_device;
Signature · 1 line
2.20.1
PATCH 1/1 spl: Set spl_image->fdt_addr pointer for full fitImage configuration
Quoted 6 lines · Marek Vasut
Set the
spl_image->fdt_addrpointer both for simple fitImage configuration as well as full fitImage configuration, to letspl_perform_fixups()access the DT and perform modifications to it if necessary.Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/d4117300/attachment.sig>