projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
at91-common
/
spl.c
diff --git
a/arch/arm/cpu/at91-common/spl.c
b/arch/arm/cpu/at91-common/spl.c
index 2598e09959cd9e5d24a4d24ec38d9200944156e8..7f4debb912597d5a251cfa095b0309497b2528b0 100644
(file)
--- a/
arch/arm/cpu/at91-common/spl.c
+++ b/
arch/arm/cpu/at91-common/spl.c
@@
-52,6
+52,8
@@
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