Remove code duplication in spl_nand_load_image().
No functional changes.
Signed-off-by: Nikita Kiryanov <nik...@compulab.co.il>
Cc: Scott Wood <scottw...@freescale.com>
Cc: Igor Grinberg <grinb...@compulab.co.il>
---
common/spl/spl_nand.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index b8c369d..6e4e641 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -22,6 +22,19 @@ void spl_nand_load_image(void)
nand_deselect();
}
#else
+static int spl_nand_load_element(int offset, struct image_header *header)
+{
+ int err;
+
+ err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
+ if (err)
+ return err;
+
+ spl_parse_image_header(header);
+ return nand_spl_load_image(offset, spl_image.size,
+ (void *)spl_image.load_addr);
+}
+
void spl_nand_load_image(void)
{
struct image_header *header;
@@ -73,25 +86,13 @@ void spl_nand_load_image(void)
}
#endif
#ifdef CONFIG_NAND_ENV_DST
- nand_spl_load_image(CONFIG_ENV_OFFSET,
- sizeof(*header), (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_ENV_OFFSET, spl_image.size,
- (void *)spl_image.load_addr);
+ spl_nand_load_element(CONFIG_ENV_OFFSET, header);
#ifdef CONFIG_ENV_OFFSET_REDUND
- nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND,
- sizeof(*header), (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, spl_image.size,
- (void *)spl_image.load_addr);
+ spl_nand_load_element(CONFIG_ENV_OFFSET_REDUND, header);
#endif
#endif
/* Load u-boot */
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- sizeof(*header), (void *)header);
- spl_parse_image_header(header);
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- spl_image.size, (void *)(unsigned long)spl_image.load_addr);
+ spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS, header);
nand_deselect();
}
#endif
--
1.9.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
