diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-16 12:31:57 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-17 09:13:07 +0200 |
| commit | 7802c6f891b77536251dca7e41869c7ea3e12dd4 (patch) | |
| tree | 7287b2c7396582331b6cfa980c34ad1ac0cd5bb6 /arch/arm/boards/dfi-fs700-m60 | |
| parent | 23da05b9e9a6827b19cf8f89255a378fbbf0fbfe (diff) | |
| download | barebox-7802c6f891b77536251dca7e41869c7ea3e12dd4.tar.gz barebox-7802c6f891b77536251dca7e41869c7ea3e12dd4.tar.xz | |
ARM: i.MX6: boot: Return BOOTSOURCE_SPI_NOR, not BOOTSOURCE_SPI
We use BOOTSOURCE_SPI to denote, among other things, QSPI on i.MX7 and
VFxxx, whereas on i.MX6 it is used to mean SPI-NOR. To make functions
like imx_xload() work consistently across various i.MX platforms use
already existent BOOTSOURCE_SPI_NOR constant to mean booting from
SPI-NOR on i.MX6 as well.
Replace all in-tree code that relying on the old value as well.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/dfi-fs700-m60')
| -rw-r--r-- | arch/arm/boards/dfi-fs700-m60/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/dfi-fs700-m60/board.c b/arch/arm/boards/dfi-fs700-m60/board.c index bef4612d9e..2cb8e3106f 100644 --- a/arch/arm/boards/dfi-fs700-m60/board.c +++ b/arch/arm/boards/dfi-fs700-m60/board.c @@ -105,7 +105,7 @@ static int dfi_fs700_m60_init(void) phy_register_fixup_for_uid(PHY_ID_AR8031, AR_PHY_ID_MASK, ar8031_phy_fixup); - if (bootsource_get() == BOOTSOURCE_SPI) + if (bootsource_get() == BOOTSOURCE_SPI_NOR) flag_spi |= BBU_HANDLER_FLAG_DEFAULT; else flag_mmc |= BBU_HANDLER_FLAG_DEFAULT; |