From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex G. Date: Tue, 30 Mar 2021 12:54:21 -0500 Subject: [PATCH 2/6] spl: LOAD_FIT_FULL: Do not hard-code os to IH_OS_U_BOOT In-Reply-To: References: <20210311213209.4013010-1-mr.nuke.me@gmail.com> <20210311213209.4013010-3-mr.nuke.me@gmail.com> Message-ID: <5ca520c8-5919-57db-e7a5-884f53b738ed@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 3/29/21 2:43 AM, Simon Glass wrote: > On Fri, 12 Mar 2021 at 10:32, 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 >> --- >> common/spl/spl.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/common/spl/spl.c b/common/spl/spl.c >> index 986cfbc6fd..8f6c8dba6f 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; > +8 bytes. Down in the noise Alex >> - 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); >> -- >> 2.26.2 >> > > Regards, > Simon >