summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-07-15 16:02:21 +0200
committerTom Rini <trini@konsulko.com>2015-07-27 15:02:05 -0400
commitdf844772f74886b55515b9f7f5c807facc312184 (patch)
treedef4c3788c64f950c4ca9d8c88123f8e7a3e932e /arch/arm/cpu/armv7/omap-common
parent62c5674ea136a887096fb7d6a9531c6250d27dac (diff)
downloadblackbird-obmc-uboot-df844772f74886b55515b9f7f5c807facc312184.tar.gz
blackbird-obmc-uboot-df844772f74886b55515b9f7f5c807facc312184.zip
omap-common: Boot device define instead of hardcoded value
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>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 3e67d625a2..f2a25dcdc9 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
OpenPOWER on IntegriCloud