From: Marek Vasut <marex@denx.de>
Date: Sat, 14 May 2016 21:42:28 +0000 (+0200)
Subject: ARM: at91: Don't invoke spl_boot_device() twice
X-Git-Tag: v2016.07-rc3~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=968ebdf1ef1493a9095cbc00934d608c624bcad4;p=oweals%2Fu-boot.git

ARM: at91: Don't invoke spl_boot_device() twice

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 <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
---

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: