diff options
author | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-03-10 14:22:54 -0400 |
commit | 5495dae7aa9d5cd161e07174d38acac86515c58a (patch) | |
tree | 848c7f48688aeb5ada1fe221dc5dff4729561814 /arch/arm/cpu/at91-common | |
parent | c0d297946fd2540c8057eb1589429978da888dbb (diff) | |
parent | 27019e4a949fc3be2e895ac20839c4d4d119f902 (diff) | |
download | u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.zip u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.gz u-boot-imx-5495dae7aa9d5cd161e07174d38acac86515c58a.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/at91-common')
-rw-r--r-- | arch/arm/cpu/at91-common/spl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c index 37c0cc4..7f4debb 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -52,6 +52,10 @@ u32 spl_boot_device(void) { #ifdef CONFIG_SYS_USE_MMC return BOOT_DEVICE_MMC1; +#elif CONFIG_SYS_USE_NANDFLASH + return BOOT_DEVICE_NAND; +#elif CONFIG_SYS_USE_SERIALFLASH + return BOOT_DEVICE_SPI; #endif return BOOT_DEVICE_NONE; } |