| Message ID | 1436968946-16025-4-git-send-email-contact@paulk.fr |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Jul 15, 2015 at 04:02:21PM +0200, Paul Kocialkowski wrote: > Now that SPL boot devices are clearly defined, we can use BOOT_DEVICE_QSPI_4 > instead of a hardcoded value. > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 3e67d62..f2a25dc 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -48,14 +48,14 @@ void save_omap_boot_params(void) if (boot_device == BOOT_DEVICE_NAND_I2C) boot_device = BOOT_DEVICE_NAND; #endif -#if defined(CONFIG_DRA7XX) || defined(CONFIG_AM57XX) +#ifdef BOOT_DEVICE_QSPI_4 /* * We get different values for QSPI_1 and QSPI_4 being used, but * don't actually care about this difference. Rather than * mangle the later code, if we're coming in as QSPI_4 just * change to the QSPI_1 value. */ - if (boot_device == 11) + if (boot_device == BOOT_DEVICE_QSPI_4) boot_device = BOOT_DEVICE_SPI; #endif
Now that SPL boot devices are clearly defined, we can use BOOT_DEVICE_QSPI_4 instead of a hardcoded value. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> --- arch/arm/cpu/armv7/omap-common/boot-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)