common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled
PATCH v2 1/2 common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled
If FIT_IMAGE_TINY is enabled, spl_fit_image_get_os returns -ENOTSUPP. In this case, we should default to IH_OS_U_BOOT not to IH_OS_INVALID.
---
Changes since v1:
* added the #if FIT_IMAGE_TINY as suggested by Mark Vasut
common/spl/spl_fit.c | 4 ++++ 1 file changed, 4 insertions(+)
common/spl/spl_fit.c +4 -0
@@ -491,6 +491,10 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,if (!spl_fit_image_get_os (fit, node, &os_type))debug ("Loadable is %s\n" ,genimg_get_os_name (os_type)); +#if CONFIG_IS_ENABLED (FIT_IMAGE_TINY ) + else + os_type =IH_OS_U_BOOT ; +#endif if (os_type ==IH_OS_U_BOOT ) { spl_fit_append_fdt(&image_info, info, sector,
Signature · 1 line
2.7.4
PATCH v2 2/2 tools: fit_image: Add the loadable property to configs
When running mkimage with "-f auto", the loadable property needs to be set in order to allow SPL FIT support to boot.
--- tools/fit_image.c | 1 + 1 file changed, 1 insertion(+)
tools/fit_image.c +1 -0
@@ -298,6 +298,7 @@ static void fit_write_configs(struct image_tool_params *params, char *fdt) typename =genimg_get_type_short_name (params->fit_image_type);snprintf (str,sizeof (str),"%s-1" , typename);fdt_property_string (fdt, typename, str); +fdt_property_string (fdt,FIT_LOADABLE_PROP , str);if (params->fit_ramdisk) fdt_property_string(fdt, FIT_RAMDISK_PROP,
Signature · 1 line
2.7.4
PATCH v2 2/2 tools: fit_image: Add the loadable property to configs
Quoted 5 lines · Abel Vesa
When running mkimage with "-f auto", the loadable property needs to be set in order to allow SPL FIT support to boot.
Signed-off-by Abel Vesa <[email protected]>
Tom/Stefano,
These two patches fix a boot regression on mx6sabresd/sabreauto.
Please consider applying it for 2019.04.
Thanks
PATCH v2 2/2 tools: fit_image: Add the loadable property to configs
Quoted 7 lines · Fabio Estevam
Quoted 5 lines · Abel Vesa
When running mkimage with "-f auto", the loadable property needs to be set in order to allow SPL FIT support to boot.
Signed-off-by Abel Vesa <[email protected]>
Quoted 9 lines
Tested-by Fabio Estevam <[email protected]>Tom/Stefano,
These two patches fix a boot regression on mx6sabresd/sabreauto.
Please consider applying it for 2019.04.
Thanks to report these - there are also a few other patches that I have already picked up. I take these twos and I sent a new PR.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 2/2 tools: fit_image: Add the loadable property to configs
In reply to Abel VesaQuoted 5 lines · Abel Vesa
When running mkimage with "-f auto", the loadable property needs to be set in order to allow SPL FIT support to boot.
Signed-off-by Abel Vesa <[email protected]>Tested-by Fabio Estevam <[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/20190322/36406983/attachment.sig>
PATCH v2 2/2 tools: fit_image: Add the loadable property to configs
In reply to Abel VesaQuoted 5 lines · Abel Vesa
When running mkimage with "-f auto", the loadable property needs to be set in order to allow SPL FIT support to boot.
Signed-off-by Abel Vesa <[email protected]>
I've just bisected out to this commit breaking Y-Modem booting of FIT U-Boot on am335x. Right now I'm at a bit of a loss as to why, as I can't find a code path where FIT_LOADABLE_PROP would be treated differently between UART and MMC booting (which still works).
That said the loadables stuff with this patch doesn't seem to match up with what doc/uImage.FIT/howto.txt has to say about loadables:
/ {
timestamp = <0x5cb08987>;
description = "Firmware image with one or more FDT blobs";
creator = "U-Boot mkimage 2019.04-00217-g38927694f48a-dirty";
#address-cells = <0x00000001>;
images {
firmware-1 {
data-size = <0x0005e204>;
data-offset = <0x00000000>;
description = "U-Boot 2019.04-00217-g38927694f48a-dirty
for A335XHUB board";
type = "firmware";
arch = "arm";
os = "u-boot";
compression = "none";
load = <0x80800000>;
entry = <0x00000000>;
};
fdt-1 {
data-size = <0x000080c4>;
data-offset = <0x0005e204>;
description = "A335XHUB-0001";
type = "firmware";
arch = "arm";
compression = "none";
};
fdt-2 {
data-size = <0x000088f4>;
data-offset = <0x000662c8>;
description = "A335XHUB-0003";
type = "firmware";
arch = "arm";
compression = "none";
};
};
configurations {
default = "conf-1";
conf-1 {
description = "A335XHUB-0001";
firmware = "firmware-1";
loadables = "firmware-1";
fdt = "fdt-1";
};
conf-2 {
description = "A335XHUB-0003";
firmware = "firmware-1";
loadables = "firmware-1";
fdt = "fdt-2";
};
};
};Still digging...
Signature · 1 line
Alex Kiernan
PATCH v2 1/2 common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled
In reply to Abel VesaQuoted 5 lines · Abel Vesa
If
FIT_IMAGE_TINYis enabled,spl_fit_image_get_osreturns-ENOTSUPP. In this case, we should default toIH_OS_U_BOOTnot toIH_OS_INVALID.Signed-off-by Abel Vesa <[email protected]>
PATCH v2 1/2 common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled
In reply to Abel VesaQuoted 5 lines · Abel Vesa
If
FIT_IMAGE_TINYis enabled,spl_fit_image_get_osreturns-ENOTSUPP. In this case, we should default toIH_OS_U_BOOTnot toIH_OS_INVALID.Signed-off-by Abel Vesa <[email protected]>Tested-by Fabio Estevam <[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/20190322/0f2c8051/attachment.sig>