diff options
| author | Tom Rini | 2016-07-15 10:44:01 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-07-15 10:44:01 -0400 |
| commit | 1f9ef0dca0a1315f0a216808ade8946bcc54e2b4 (patch) | |
| tree | 681b36952636ee3b649e70f426ea4b9c024c397e /common | |
| parent | 926fbcc08327bd0ffb9964765e6573c432957998 (diff) | |
| parent | b7073965a343fca2bcde4195fbba664c98f309d8 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 12aed029356..14320fe75c1 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -270,7 +270,7 @@ struct boot_device_name boot_name_table[] = { #ifdef CONFIG_SPL_YMODEM_SUPPORT { BOOT_DEVICE_UART, "UART" }, #endif -#ifdef CONFIG_SPL_SPI_SUPPORT +#if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT) { BOOT_DEVICE_SPI, "SPI" }, #endif #ifdef CONFIG_SPL_ETH_SUPPORT @@ -346,7 +346,7 @@ static int spl_load_image(u32 boot_device) case BOOT_DEVICE_UART: return spl_ymodem_load_image(); #endif -#ifdef CONFIG_SPL_SPI_SUPPORT +#if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT) case BOOT_DEVICE_SPI: return spl_spi_load_image(); #endif |