Re: [U-Boot] [PATCH] common: spl_fit: Allow firmware image if no loadables

[Fabio Estevam]

Hi Abel,

On Wed, Mar 6, 2019 at 8:48 AM Abel Vesa  wrote:
>
> If CONFIG_SPL_OS_BOOT and FIT_IMAGE_TINY are enabled,
> the os will not be set to anything and therefore will
> remain as IH_OS_INVALID. What's needed here is to
> have IH_OS_U_BOOT as default. And since using the
> mkimage oneline command (that is, no its file), the
> loadables can't be specified, so we allow firmware
> as a fallback.
>
> Signed-off-by: Abel Vesa 

This patch causes the following build warning:

CC  spl/common/spl/spl_fit.o
common/spl/spl_fit.c: In function ‘spl_load_simple_fit’:
common/spl/spl_fit.c:484:3: warning: this ‘if’ clause does not
guard... [-Wmisleading-indentation]
   if (node < 0)
   ^~
common/spl/spl_fit.c:487:4: note: ...this statement, but the latter is
misleadingly indented as if it were guarded by the ‘if’
if (node < 0)
^~

This fixes the boot on mx6sabresd. With the build warning fixed you can add:

Tested-by: Fabio Estevam 
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH] common: spl_fit: Allow firmware image if no loadables

[Abel Vesa]

If CONFIG_SPL_OS_BOOT and FIT_IMAGE_TINY are enabled,
the os will not be set to anything and therefore will
remain as IH_OS_INVALID. What's needed here is to
have IH_OS_U_BOOT as default. And since using the
mkimage oneline command (that is, no its file), the
loadables can't be specified, so we allow firmware
as a fallback.

Signed-off-by: Abel Vesa 
---
 common/spl/spl_fit.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index db43626..d5aa792 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -478,11 +478,14 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 
/* Now check if there are more images for us to load */
for (; ; index++) {
-   uint8_t os_type = IH_OS_INVALID;
+   uint8_t os_type = IH_OS_U_BOOT;
 
node = spl_fit_get_image_node(fit, images, "loadables", index);
if (node < 0)
-   break;
+   node = spl_fit_get_image_node(fit, images,
+ "firmware", index);
+   if (node < 0)
+   break;
 
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
 _info);
-- 
2.7.4

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot