]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
use spl_ymodem_load_image() as fallback if NAND boot fails
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 19 Oct 2012 06:59:37 +0000 (08:59 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 19 Oct 2012 06:59:37 +0000 (08:59 +0200)
arch/arm/cpu/armv7/omap-common/spl.c

index 4d1ac85d0091de429ccda8e341713ba0aa1c62e3..a7ba6418b75bd63ca5414e38d4759badcc4f047c 100644 (file)
@@ -168,8 +168,9 @@ void board_init_r(gd_t *id, ulong dummy)
 #endif
 #ifdef CONFIG_SPL_NAND_SUPPORT
        case BOOT_DEVICE_NAND:
-               spl_nand_load_image();
-               break;
+               if (spl_nand_load_image() == 0)
+                       break;
+               /* fall thru to ymodem (if supported) */
 #endif
 #ifdef CONFIG_SPL_YMODEM_SUPPORT
        case BOOT_DEVICE_UART: