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 | |
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')
-rw-r--r-- | arch/arm/boards/datamodul-edm-qmx6/board.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/dfi-fs700-m60/board.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/phytec-som-imx6/board.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/zii-imx6q-rdu2/lowlevel.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/boot.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/xload.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index 043a93461b..d93c940e3d 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -132,7 +132,7 @@ static int realq7_device_init(void) } break; default: - case BOOTSOURCE_SPI: + case BOOTSOURCE_SPI_NOR: of_device_enable_path("/chosen/environment-spi"); break; } 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; diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index 717a22963a..ecb22f9562 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -152,7 +152,7 @@ static int physom_imx6_devices_init(void) environment_path = basprintf("/chosen/environment-nand"); envdev = "NAND flash"; break; - case BOOTSOURCE_SPI: + case BOOTSOURCE_SPI_NOR: environment_path = basprintf("/chosen/environment-spinor"); envdev = "SPI NOR flash"; break; diff --git a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c index 22ffdf85ea..3b4dbd212e 100644 --- a/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c +++ b/arch/arm/boards/zii-imx6q-rdu2/lowlevel.c @@ -290,7 +290,7 @@ static noinline void rdu2_sram_setup(void) write_regs(imx6q_dcd, ARRAY_SIZE(imx6q_dcd)); imx6_get_boot_source(&bootsrc, &instance); - if (bootsrc == BOOTSOURCE_SPI) + if (bootsrc == BOOTSOURCE_SPI_NOR) imx6_spi_start_image(0); else imx6_esdhc_start_image(instance); diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 9e67cedf6d..c3e2ec5017 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -375,7 +375,7 @@ static enum bootsource imx6_bootsource_serial_rom(uint32_t sbmr) const int source = __imx6_bootsource_serial_rom(sbmr); return source < IMX6_BOOTSOURCE_SERIAL_ROM_I2C1 ? - BOOTSOURCE_SPI : BOOTSOURCE_I2C; + BOOTSOURCE_SPI_NOR : BOOTSOURCE_I2C; } static int imx6_boot_instance_serial_rom(uint32_t sbmr) diff --git a/arch/arm/mach-imx/xload.c b/arch/arm/mach-imx/xload.c index 16d56ab288..921e9ade20 100644 --- a/arch/arm/mach-imx/xload.c +++ b/arch/arm/mach-imx/xload.c @@ -24,7 +24,7 @@ static __noreturn int imx_xload(void) pr_info("booting from MMC\n"); buf = bootstrap_read_disk("disk0.0", "fat"); break; - case BOOTSOURCE_SPI: + case BOOTSOURCE_SPI_NOR: pr_info("booting from SPI\n"); buf = bootstrap_read_devfs("dataflash0", false, SZ_256K, SZ_1M, SZ_1M); |