Re: [U-Boot] [PATCH v2 1/4] ARM: at91: spl: specify MMC and NAND boot device

[Simon Glass]

On 23 March 2017 at 21:34, Wenyou Yang  wrote:
> 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 
> ---
>
> Changes in v2: None
>
>  arch/arm/mach-at91/spl.c | 7 +++
>  1 file changed, 7 insertions(+)

Applied to u-boot-dm, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2 1/4] ARM: at91: spl: specify MMC and NAND boot device

[Wenyou Yang]

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 
---

Changes in v2: None

 arch/arm/mach-at91/spl.c | 7 +++
 1 file changed, 7 insertions(+)

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;
 
-- 
2.11.0

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot