diff options
| author | Wenyou Yang <wenyou.yang@atmel.com> | 2017-03-24 11:34:03 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-04-13 14:44:51 -0600 |
| commit | c00d7c33ba0150ccac01aad67a56295bfc8ed824 (patch) | |
| tree | a5663ee84feaed81e17427cdc4287aa914b3d665 | |
| parent | 40e14221361970967bad1f87faf5151cb8bc982d (diff) | |
ARM: at91: spl: specify MMC and NAND boot device
When OF_CONTROL is enabled, MMC boot device should not be detected
automatically, it should be MMC1 fixedly only the status "enabled"
is available.
Add NAND Flash boot device as well.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
| -rw-r--r-- | arch/arm/mach-at91/spl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 98f280cbf7..e113336b7b 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -39,12 +39,16 @@ u32 spl_boot_device(void) #if defined(CONFIG_SYS_USE_MMC) 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 @@ -53,6 +57,9 @@ u32 spl_boot_device(void) return BOOT_DEVICE_SPI; #endif + if (dev == ATMEL_SAMA5_BOOT_FROM_SMC) + return BOOT_DEVICE_NAND; + if (dev == ATMEL_SAMA5_BOOT_FROM_SAMBA) return BOOT_DEVICE_USB; |