From 968ebdf1ef1493a9095cbc00934d608c624bcad4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 14 May 2016 23:42:28 +0200 Subject: ARM: at91: Don't invoke spl_boot_device() twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the spl_boot_mode() is now passed the boot device to boot from, make use of it instead of inquiring for the boot device again. This allows board_boot_order() to function correctly. Signed-off-by: Marek Vasut Cc: Andreas Bießmann Reviewed-by: Andreas Bießmann --- arch/arm/mach-at91/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index ad6a597c73..98f280cbf7 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -77,7 +77,7 @@ u32 spl_boot_device(void) u32 spl_boot_mode(const u32 boot_device) { - switch (spl_boot_device()) { + switch (boot_device) { #ifdef CONFIG_SYS_USE_MMC case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: -- cgit v1.2.1