karo: merge with Ka-Ro specific tree for secure boot support

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

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1826c47a99c464bd0023f3c173cab788de49acb0..46447f4905216bb98748794d07752ea8c8121483 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: