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 1826c47a99c464bd0023f3c173cab788de49acb0..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:
@@ -231,7 +232,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #endif
        default:
 #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-               printf("SPL: Unsupported Boot Device %d\n", boot_device);
+               puts("SPL: Unsupported Boot Device!\n");
 #endif
                hang();
        }