From 2b1cdafa9fdd0c88eb1bc96e9330e252c9795689 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 14 May 2016 23:42:07 +0200 Subject: common: Pass the boot device into spl_boot_mode() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- arch/arm/cpu/arm1136/mx35/generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/cpu/arm1136/mx35/generic.c') diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index bc98edda7a..068d93eeec 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -526,7 +526,7 @@ u32 spl_boot_device(void) } #ifdef CONFIG_SPL_BUILD -u32 spl_boot_mode(void) +u32 spl_boot_mode(const u32 boot_device) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: -- cgit v1.2.1