path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
diff options
authorMarek Vasut <>2016-05-14 23:42:07 +0200
committerAndreas Bießmann <>2016-06-26 20:17:22 +0200
commit2b1cdafa9fdd0c88eb1bc96e9330e252c9795689 (patch)
tree5d81e6fe31f534d1d970eb1d62d1ad10e2837933 /arch/arm/cpu/armv7/omap-common/boot-common.c
parent4141e85bcd79c0b9b16def710e527f165107b7af (diff)
common: Pass the boot device into spl_boot_mode()
The SPL code already knows which boot device it calls the spl_boot_mode() on, so pass that information into the function. This allows the code of spl_boot_mode() avoid invoking spl_boot_device() again, but it also lets board_boot_order() correctly alter the behavior of the boot process. The later one is important, since in certain cases, it is desired that spl_boot_device() return value be overriden using board_boot_order(). Signed-off-by: Marek Vasut <> Cc: Andreas Bießmann <> Cc: Albert Aribaud <> Cc: Tom Rini <> Reviewed-by: Andreas Bießmann <> [add newly introduced zynq variant] Signed-aff-by: Andreas Bießmann <>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 8333b20001..60c367a202 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -166,7 +166,7 @@ u32 spl_boot_device(void)
return gd->arch.omap_boot_device;
-u32 spl_boot_mode(void)
+u32 spl_boot_mode(const u32 boot_device)
return gd->arch.omap_boot_mode;
OpenPOWER on IntegriCloud