projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
62c5674
)
omap-common: Boot device define instead of hardcoded value
author
Paul Kocialkowski
<
[email protected]
>
Wed, 15 Jul 2015 14:02:21 +0000
(16:02 +0200)
committer
Tom Rini
<
[email protected]
>
Mon, 27 Jul 2015 19:02:05 +0000
(15:02 -0400)
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 <
[email protected]
>
arch/arm/cpu/armv7/omap-common/boot-common.c
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/armv7/omap-common/boot-common.c
b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 3e67d625a296bfeb19533ef1e79bfa0fd27fb821..f2a25dcdc905a5ab2f2737ae3872412d87fdb3be 100644
(file)
--- 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)
+#if
def 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