update to 2015.04-rc1

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

diff --git a/common/spl/spl.c b/common/spl/spl.c
index daaeb507c467b14cf0f80ecaab46e48064e58672..526bd1a754490c5f93cdd9f0d6786c1b7828dbb2 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -182,8 +182,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: