LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Wenyou Yang 2017-03-24 11:34:03 +08:00 committed by Simon Glass
parent 40e1422136
commit c00d7c33ba
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-at91/spl.c
View File

@ -39,12 +39,16 @@ u32 spl_boot_device(void)
#if defined(CONFIG_SYS_USE_MMC) #if defined(CONFIG_SYS_USE_MMC)
if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) { if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) {
#if defined(CONFIG_SPL_OF_CONTROL)
return BOOT_DEVICE_MMC1;
#else
if (off == 0) if (off == 0)
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
if (off == 1) if (off == 1)
return BOOT_DEVICE_MMC2; return BOOT_DEVICE_MMC2;
printf("ERROR: MMC controller %i not present!\n", dev); printf("ERROR: MMC controller %i not present!\n", dev);
hang(); hang();
#endif
} }
#endif #endif
@ -53,6 +57,9 @@ u32 spl_boot_device(void)
return BOOT_DEVICE_SPI; return BOOT_DEVICE_SPI;
#endif #endif
if (dev == ATMEL_SAMA5_BOOT_FROM_SMC)
return BOOT_DEVICE_NAND;
if (dev == ATMEL_SAMA5_BOOT_FROM_SAMBA) if (dev == ATMEL_SAMA5_BOOT_FROM_SAMBA)
return BOOT_DEVICE_USB; return BOOT_DEVICE_USB;