diff options
| author | Tom Rini | 2016-06-20 05:15:52 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-06-20 05:15:52 -0400 |
| commit | 2313d48445e59f063ec9a3b4940fe8252737db76 (patch) | |
| tree | de829dc59a4b4437ddf5f3f2bde8c56ffda17395 /common | |
| parent | 1a3619cf825fcef15ebe0fac6d65a9af1bc0588c (diff) | |
| parent | 30780f948346436f9974fd6eae89aa2eb841b436 (diff) | |
Merge git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'common')
| -rw-r--r-- | common/fb_nand.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_nand.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/common/fb_nand.c b/common/fb_nand.c index e55ea3872fd..ae34f4891b6 100644 --- a/common/fb_nand.c +++ b/common/fb_nand.c @@ -34,7 +34,7 @@ __weak int board_fastboot_write_partition_setup(char *name) } static int fb_nand_lookup(const char *partname, char *response, - struct mtd_info **nand, + struct mtd_info **mtd, struct part_info **part) { struct mtd_device *dev; diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 7cf0d1b9860..0e35e0fd6b1 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -134,6 +134,13 @@ int spl_nand_load_image(void) #endif /* Load u-boot */ err = spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS, header); +#ifdef CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND +#if CONFIG_SYS_NAND_U_BOOT_OFFS != CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND + if (err) + err = spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND, + header); +#endif +#endif nand_deselect(); return err; } |