|
@@ -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)) {
|