spl: eMMC/SD: Provide one __weak spl_boot_mode() function

[people/ms/u-boot.git] / arch / arm / mach-at91 / spl.c

diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index 27a405a42bf884ed49f2646646637e910386057d..91add921c65d45e6cf5fc88672f48e0232f84d30 100644 (file)
--- a/arch/arm/mach-at91/spl.c
+++ b/arch/arm/mach-at91/spl.c
@@ -23,28 +23,67 @@ void at91_disable_wdt(void)
 }
 #endif
 
+#if defined(CONFIG_SAMA5D2) || defined(CONFIG_SAMA5D3) || \
+    defined(CONFIG_SAMA5D4)
+#include <asm/arch/sama5_boot.h>
+struct {
+       u32     r4;
+} bootrom_stash __attribute__((section(".data")));
+
 u32 spl_boot_device(void)
 {
-#ifdef CONFIG_SYS_USE_MMC
+       u32 dev = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_FROM_OFF) &
+                 ATMEL_SAMA5_BOOT_FROM_MASK;
+       u32 off = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_DEV_ID_OFF) &
+                 ATMEL_SAMA5_BOOT_DEV_ID_MASK;
+
+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
+       if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) {
+#if defined(CONFIG_SPL_OF_CONTROL)
+               return BOOT_DEVICE_MMC1;
+#else
+               if (off == 0)
+                       return BOOT_DEVICE_MMC1;
+               if (off == 1)
+                       return BOOT_DEVICE_MMC2;
+               printf("ERROR: MMC controller %i not present!\n", dev);
+               hang();
+#endif
+       }
+#endif
+
+#if defined(CONFIG_SYS_USE_SERIALFLASH) || \
+       defined(CONFIG_SYS_USE_SPIFLASH) || \
+       defined(CONFIG_SPI_BOOT)
+       if (dev == ATMEL_SAMA5_BOOT_FROM_SPI)
+               return BOOT_DEVICE_SPI;
+#endif
+       if (dev == ATMEL_SAMA5_BOOT_FROM_QSPI)
+               return BOOT_DEVICE_SPI;
+
+       if (dev == ATMEL_SAMA5_BOOT_FROM_SMC)
+               return BOOT_DEVICE_NAND;
+
+       if (dev == ATMEL_SAMA5_BOOT_FROM_SAMBA)
+               return BOOT_DEVICE_USB;
+
+       printf("ERROR: SMC/TWI/QSPI boot device not supported!\n"
+              "       Boot device %i, controller number %i\n", dev, off);
+
+       return BOOT_DEVICE_NONE;
+}
+#else
+u32 spl_boot_device(void)
+{
+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
        return BOOT_DEVICE_MMC1;
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif defined(CONFIG_SYS_USE_NANDFLASH) || defined(CONFIG_NAND_BOOT)
        return BOOT_DEVICE_NAND;
-#elif CONFIG_SYS_USE_SERIALFLASH || CONFIG_SYS_USE_SPIFLASH
+#elif defined(CONFIG_SYS_USE_SERIALFLASH) || \
+       defined(CONFIG_SYS_USE_SPIFLASH) || \
+       defined(CONFIG_SPI_BOOT)
        return BOOT_DEVICE_SPI;
 #endif
        return BOOT_DEVICE_NONE;
 }
-
-u32 spl_boot_mode(void)
-{
-       switch (spl_boot_device()) {
-#ifdef CONFIG_SYS_USE_MMC
-       case BOOT_DEVICE_MMC1:
-               return MMCSD_MODE_FS;
-               break;
 #endif
-       case BOOT_DEVICE_NONE:
-       default:
-               hang();
-       }
-}