omap-common: SYS_BOOT fallback logic correction and support for more devices

[karo-tx-uboot.git] / 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 5ec46fa14d5aad668f9ae3d0cddb5148a6f54e56..8e5d5c979ccd614e40501f1cccc3f8526578b108 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -30,6 +30,7 @@ void save_omap_boot_params(void)
 {
        u32 boot_params = *((u32 *)OMAP_SRAM_SCRATCH_BOOT_PARAMS);
        struct omap_boot_parameters *omap_boot_params;
+       int sys_boot_device = 0;
        u32 boot_device;
        u32 boot_mode;
 
@@ -64,31 +65,42 @@ void save_omap_boot_params(void)
        if (boot_device == BOOT_DEVICE_QSPI_4)
                boot_device = BOOT_DEVICE_SPI;
 #endif
-#if (defined(BOOT_DEVICE_UART) && !defined(CONFIG_SPL_YMODEM_SUPPORT)) || \
-    (defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT)) || \
-    (defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT))
        /*
         * When booting from peripheral booting, the boot device is not usable
         * as-is (unless there is support for it), so the boot device is instead
         * figured out using the SYS_BOOT pins.
         */
        switch (boot_device) {
-#ifdef BOOT_DEVICE_UART
-       case BOOT_DEVICE_UART:
+#if defined(BOOT_DEVICE_UART) && !defined(CONFIG_SPL_YMODEM_SUPPORT)
+               case BOOT_DEVICE_UART:
+                       sys_boot_device = 1;
+                       break;
+#endif
+#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT)
+               case BOOT_DEVICE_USB:
+                       sys_boot_device = 1;
+                       break;
 #endif
-#ifdef BOOT_DEVICE_USB
-       case BOOT_DEVICE_USB:
+#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+               case BOOT_DEVICE_USBETH:
+                       sys_boot_device = 1;
+                       break;
+#endif
+#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT)
+               case BOOT_DEVICE_CPGMAC:
+                       sys_boot_device = 1;
+                       break;
 #endif
+       }
+
+       if (sys_boot_device) {
                boot_device = omap_sys_boot_device();
 
                /* MMC raw mode will fallback to FS mode. */
                if ((boot_device >= MMC_BOOT_DEVICES_START) &&
                    (boot_device <= MMC_BOOT_DEVICES_END))
                        boot_mode = MMCSD_MODE_RAW;
-
-               break;
        }
-#endif
 
        gd->arch.omap_boot_device = boot_device;