mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd_bootm.c: Re-order bootm_load_os return check for ELDK4.2

Browse source 
With ELDK4.2 we were getting a warning that load_end may be used
uninitialized in calling lmb_reserve.  This could not be the case,
however.  If we re-order the checks (and make them slightly clearer as
well) the warning goes away.  bootm_load_os may only return 0 on
success, BOOTM_ERR_OVERLAP in a non-fatal overlap (already covered in
comments) or a fatal BOOTM_ERR that is covered in the error handler.

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2013-07-11 09:35:23 -04:00
parent ecc8edbf69
commit 970150a167
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/cmd_bootm.c
View file

@ -650,12 +650,11 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc,
iflag = bootm_disable_interrupts(); iflag = bootm_disable_interrupts();
ret = bootm_load_os(images, &load_end, 0); ret = bootm_load_os(images, &load_end, 0);
if (ret && ret != BOOTM_ERR_OVERLAP)
goto err;
if (ret == 0) if (ret == 0)
lmb_reserve(&images->lmb, images->os.load, lmb_reserve(&images->lmb, images->os.load,
(load_end - images->os.load)); (load_end - images->os.load));
else if (ret && ret != BOOTM_ERR_OVERLAP)
goto err;
else if (ret == BOOTM_ERR_OVERLAP) else if (ret == BOOTM_ERR_OVERLAP)
ret = 0; ret = 0;
} }