diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-31 19:15:59 -0400 |
| commit | 10697704ca579850b0edc0e772671c32586d76ee (patch) | |
| tree | f21e248ad0a081d56f96c16d524be5761a46091e /arch/arm/mach-at91/spl.c | |
| parent | 482cbd553daf3d9cd21e564702bac84a6bd43f2f (diff) | |
| parent | b2d387bcebba352ca64b781486507800964d7ffd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/mach-at91/spl.c')
| -rw-r--r-- | arch/arm/mach-at91/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index aaa5eec2e6..27a405a42b 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -29,7 +29,7 @@ u32 spl_boot_device(void) return BOOT_DEVICE_MMC1; #elif CONFIG_SYS_USE_NANDFLASH return BOOT_DEVICE_NAND; -#elif CONFIG_SYS_USE_SERIALFLASH +#elif CONFIG_SYS_USE_SERIALFLASH || CONFIG_SYS_USE_SPIFLASH return BOOT_DEVICE_SPI; #endif return BOOT_DEVICE_NONE; |