spl: LOAD_FIT_FULL: Do not hard-code os to IH_OS_U_BOOT

The information on the OS should be contained in the FIT, as the
self-explanatory "os" property of a node under /images. Hard-coding
this to U_BOOT might send us down the wrong path later in the boot
process.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 33119e9..85fccb5 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -221,8 +221,9 @@ static int spl_load_fit_image(struct spl_image_info *spl_image,
        spl_image->size = fw_len;
        spl_image->entry_point = fw_data;
        spl_image->load_addr = fw_data;
-       spl_image->os = IH_OS_U_BOOT;
-       spl_image->name = "U-Boot";
+       if (fit_image_get_os(header, ret, &spl_image->os))
+               spl_image->os = IH_OS_INVALID;
+       spl_image->name = genimg_get_os_name(spl_image->os);
 
        debug(SPL_TPL_PROMPT "payload image: %32s load addr: 0x%lx size: %d\n",
              spl_image->name, spl_image->load_addr, spl_image->size);