Message ID | 20210401182531.2147653-3-mr.nuke.me@gmail.com |
---|---|
State | Accepted |
Commit | 2eaae17bc90ec524dbddc52a85ff3705727d7c5a |
Delegated to: | Tom Rini |
Headers | show |
Series | SPL: FIT: Fix some omissions of SPL_LOAD_FIT_FULL and bootm | expand |
On Thu, Apr 01, 2021 at 01:25:27PM -0500, Alexandru Gagniuc wrote: > 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. > > Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl.c b/common/spl/spl.c index 986cfbc6fd..f3b4c3a036 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -220,8 +220,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);
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. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> --- common/spl/spl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)