mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
spl: spl_nor: Remove unused variable 'ret' warning
With the if statement now for the legacy image handling, the compiler now generates this compile time warning: common/spl/spl_nor.c:27:6: warning: unused variable 'ret' [-Wunused-variable] This patch removes this warning by changing the 'ret' variable handling. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Cc: Weijie Gao <weijie.gao@mediatek.com> Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
parent
2fc91ed3ba
commit
f1b0f1550b
1 changed files with 6 additions and 6 deletions
|
@ -24,7 +24,6 @@ unsigned long __weak spl_nor_get_uboot_base(void)
|
|||
static int spl_nor_load_image(struct spl_image_info *spl_image,
|
||||
struct spl_boot_device *bootdev)
|
||||
{
|
||||
int ret;
|
||||
__maybe_unused const struct image_header *header;
|
||||
__maybe_unused struct spl_load_info load;
|
||||
|
||||
|
@ -43,6 +42,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
|
|||
header = (const struct image_header *)CONFIG_SYS_OS_BASE;
|
||||
#ifdef CONFIG_SPL_LOAD_FIT
|
||||
if (image_get_magic(header) == FDT_MAGIC) {
|
||||
int ret;
|
||||
|
||||
debug("Found FIT\n");
|
||||
load.bl_len = 1;
|
||||
load.read = spl_nor_load_read;
|
||||
|
@ -61,6 +62,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
|
|||
#endif
|
||||
if (image_get_os(header) == IH_OS_LINUX) {
|
||||
/* happy - was a Linux */
|
||||
int ret;
|
||||
|
||||
ret = spl_parse_image_header(spl_image, header);
|
||||
if (ret)
|
||||
|
@ -93,11 +95,9 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
|
|||
debug("Found FIT format U-Boot\n");
|
||||
load.bl_len = 1;
|
||||
load.read = spl_nor_load_read;
|
||||
ret = spl_load_simple_fit(spl_image, &load,
|
||||
spl_nor_get_uboot_base(),
|
||||
(void *)header);
|
||||
|
||||
return ret;
|
||||
return spl_load_simple_fit(spl_image, &load,
|
||||
spl_nor_get_uboot_base(),
|
||||
(void *)header);
|
||||
}
|
||||
#endif
|
||||
if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
|
||||
|
|
Loading…
Add table
Reference in a new issue