merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index d6b0e01075913547efafbf690d539112f106c9c5..fc49fba707ff0730a4c66990f1ee719cf228062a 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -167,8 +167,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #endif
 #ifdef CONFIG_SPL_NAND_SUPPORT
        case BOOT_DEVICE_NAND:
-               spl_nand_load_image();
-               break;
+               if (spl_nand_load_image() == 0)
+                       break;
+               /* fallthru in case of failure to activate ymodem download */
 #endif
 #ifdef CONFIG_SPL_ONENAND_SUPPORT
        case BOOT_DEVICE_ONENAND: