spl: make spl_nand_load_image() return int to enable fallthru to spl_ymodem_load_imag...

diff --git a/common/spl/spl.c b/common/spl/spl.c
index ff9ba7b0a59ef5cff6fddbb7771da8b6d63e26ee..8afce3a51b3cf5282cc47f0b45dda6e2437d9e95 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -194,8 +194,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_NOR_SUPPORT
        case BOOT_DEVICE_NOR:

diff --git a/include/spl.h b/include/spl.h
index b02f36fa94173078a185ec6e43110816a59bc807..275cadaad0f58e5140e0351bcd3ab9e51a55a63f 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -57,7 +57,7 @@ int spl_start_uboot(void);
 void spl_display_print(void);
 
 /* NAND SPL functions */
-void spl_nand_load_image(void);
+int spl_nand_load_image(void);
 
 /* NOR SPL functions */
 void spl_nor_load_image(void);