Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / arch / arm / cpu / armv7 / omap-common / boot-common.c

diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 8333b200015fb77e522852b4d08b00701560adbf..385310ba1ec95825292f55824710a8e18c087275 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -90,6 +90,11 @@ void save_omap_boot_params(void)
                case BOOT_DEVICE_CPGMAC:
                        sys_boot_device = 1;
                        break;
+#endif
+#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU_SUPPORT)
+               case BOOT_DEVICE_DFU:
+                       sys_boot_device = 1;
+                       break;
 #endif
        }
 
@@ -166,7 +171,7 @@ u32 spl_boot_device(void)
        return gd->arch.omap_boot_device;
 }
 
-u32 spl_boot_mode(void)
+u32 spl_boot_mode(const u32 boot_device)
 {
        return gd->arch.omap_boot_mode;
 }