Skip to content
Snippets Groups Projects
Commit a35c3402 authored by Wenyou Yang's avatar Wenyou Yang Committed by Tom Rini
Browse files

ARM: at91: spl: Add macro CONFIG_XXXX_BOOT support


Use the CONFIG_XXXX_BOOT to indicate the boot media, instead of
the CONFIG_SYS_USE_XXXX option, which is declared by
CONFIG_SYS_EXTRA_OPTIONS option.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@microchip.com>
parent e61ed48f
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ u32 spl_boot_device(void) ...@@ -37,7 +37,7 @@ u32 spl_boot_device(void)
u32 off = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_DEV_ID_OFF) & u32 off = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_DEV_ID_OFF) &
ATMEL_SAMA5_BOOT_DEV_ID_MASK; ATMEL_SAMA5_BOOT_DEV_ID_MASK;
#if defined(CONFIG_SYS_USE_MMC) #if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) { if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) {
#if defined(CONFIG_SPL_OF_CONTROL) #if defined(CONFIG_SPL_OF_CONTROL)
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
...@@ -52,7 +52,9 @@ u32 spl_boot_device(void) ...@@ -52,7 +52,9 @@ u32 spl_boot_device(void)
} }
#endif #endif
#if defined(CONFIG_SYS_USE_SERIALFLASH) || defined(CONFIG_SYS_USE_SPIFLASH) #if defined(CONFIG_SYS_USE_SERIALFLASH) || \
defined(CONFIG_SYS_USE_SPIFLASH) || \
defined(CONFIG_SPI_BOOT)
if (dev == ATMEL_SAMA5_BOOT_FROM_SPI) if (dev == ATMEL_SAMA5_BOOT_FROM_SPI)
return BOOT_DEVICE_SPI; return BOOT_DEVICE_SPI;
#endif #endif
...@@ -73,11 +75,13 @@ u32 spl_boot_device(void) ...@@ -73,11 +75,13 @@ u32 spl_boot_device(void)
#else #else
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {
#ifdef CONFIG_SYS_USE_MMC #if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
#elif CONFIG_SYS_USE_NANDFLASH #elif defined(CONFIG_SYS_USE_NANDFLASH) || defined(CONFIG_NAND_BOOT)
return BOOT_DEVICE_NAND; 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; return BOOT_DEVICE_SPI;
#endif #endif
return BOOT_DEVICE_NONE; return BOOT_DEVICE_NONE;
...@@ -87,7 +91,7 @@ u32 spl_boot_device(void) ...@@ -87,7 +91,7 @@ u32 spl_boot_device(void)
u32 spl_boot_mode(const u32 boot_device) u32 spl_boot_mode(const u32 boot_device)
{ {
switch (boot_device) { switch (boot_device) {
#ifdef CONFIG_SYS_USE_MMC #if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
return MMCSD_MODE_FS; return MMCSD_MODE_FS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment