image: fit: Show firmware configuration property if present
SPL ATF support requires to have firmware property which should be also listed by mkimage -l when images is created. The patch is also using this macro in spl_fit to match keyword. When image is created: Default Configuration: 'config' Configuration 0 (config) Description: ATF with full u-boot Kernel: unavailable Firmware: atf FDT: dtb Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jun Nie <jun.nie@linaro.org> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
parent
c7aead1100
commit
1f8e4bf55e
|
@ -1610,6 +1610,10 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
|
|||
if (uname)
|
||||
printf("%s Init Ramdisk: %s\n", p, uname);
|
||||
|
||||
uname = fdt_getprop(fit, noffset, FIT_FIRMWARE_PROP, NULL);
|
||||
if (uname)
|
||||
printf("%s Firmware: %s\n", p, uname);
|
||||
|
||||
for (fdt_index = 0;
|
||||
uname = fdt_stringlist_get(fit, noffset, FIT_FDT_PROP,
|
||||
fdt_index, NULL), uname;
|
||||
|
|
|
@ -395,7 +395,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
|
|||
* - fall back to using the first 'loadables' entry
|
||||
*/
|
||||
if (node < 0)
|
||||
node = spl_fit_get_image_node(fit, images, "firmware", 0);
|
||||
node = spl_fit_get_image_node(fit, images, FIT_FIRMWARE_PROP,
|
||||
0);
|
||||
#ifdef CONFIG_SPL_OS_BOOT
|
||||
if (node < 0)
|
||||
node = spl_fit_get_image_node(fit, images, FIT_KERNEL_PROP, 0);
|
||||
|
|
|
@ -920,6 +920,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size);
|
|||
#define FIT_DEFAULT_PROP "default"
|
||||
#define FIT_SETUP_PROP "setup"
|
||||
#define FIT_FPGA_PROP "fpga"
|
||||
#define FIT_FIRMWARE_PROP "firmware"
|
||||
|
||||
#define FIT_MAX_HASH_LEN HASH_MAX_DIGEST_SIZE
|
||||
|
||||
|
|
Loading…
Reference in New Issue