summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-05-14 23:42:28 +0200
committerAndreas Bießmann <andreas@biessmann.org>2016-06-26 20:17:22 +0200
commit968ebdf1ef1493a9095cbc00934d608c624bcad4 (patch)
tree3d1946942d09db188224eca2a0f2403a72f4ab73
parent2b1cdafa9fdd0c88eb1bc96e9330e252c9795689 (diff)
downloadu-boot-imx-968ebdf1ef1493a9095cbc00934d608c624bcad4.zip
u-boot-imx-968ebdf1ef1493a9095cbc00934d608c624bcad4.tar.gz
u-boot-imx-968ebdf1ef1493a9095cbc00934d608c624bcad4.tar.bz2
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>
-rw-r--r--arch/arm/mach-at91/spl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c
index ad6a597..98f280c 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: