Dear Marek Vasut,
Marek Vasut marex@denx.de writes:
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
arch/arm/cpu/arm1136/mx35/generic.c | 2 +- arch/arm/cpu/armv7/ls102xa/spl.c | 2 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- arch/arm/imx-common/spl.c | 2 +- arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-davinci/spl.c | 2 +- arch/arm/mach-mvebu/spl.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +- arch/arm/mach-socfpga/spl.c | 2 +- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 2 +- arch/arm/mach-zynq/spl.c | 2 +- common/spl/spl_mmc.c | 2 +- include/spl.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
applied to u-boot-atmel/master, thanks!
Also adopted newly introduced zynq variant of spl_boot_mode().
Best regards, Andreas Bießmann