]> git.sur5r.net Git - u-boot/commit
common: Pass the boot device into spl_boot_mode()
authorMarek Vasut <marex@denx.de>
Sat, 14 May 2016 21:42:07 +0000 (23:42 +0200)
committerAndreas Bießmann <andreas@biessmann.org>
Sun, 26 Jun 2016 18:17:22 +0000 (20:17 +0200)
commit2b1cdafa9fdd0c88eb1bc96e9330e252c9795689
tree5d81e6fe31f534d1d970eb1d62d1ad10e2837933
parent4141e85bcd79c0b9b16def710e527f165107b7af
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 <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
[add newly introduced zynq variant]
Signed-aff-by: Andreas Bießmann <andreas@biessmann.org>
16 files changed:
arch/arm/cpu/arm1136/mx35/generic.c
arch/arm/cpu/armv7/ls102xa/spl.c
arch/arm/cpu/armv7/omap-common/boot-common.c
arch/arm/cpu/armv8/fsl-layerscape/spl.c
arch/arm/cpu/armv8/zynqmp/spl.c
arch/arm/imx-common/spl.c
arch/arm/mach-at91/spl.c
arch/arm/mach-davinci/spl.c
arch/arm/mach-mvebu/spl.c
arch/arm/mach-rockchip/rk3288-board-spl.c
arch/arm/mach-socfpga/spl.c
arch/arm/mach-sunxi/board.c
arch/arm/mach-uniphier/boot-mode/boot-mode.c
arch/arm/mach-zynq/spl.c
common/spl/spl_mmc.c
include/spl.h