]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: at91: Don't invoke spl_boot_device() twice
authorMarek Vasut <marex@denx.de>
Sat, 14 May 2016 21:42:28 +0000 (23:42 +0200)
committerAndreas Bießmann <andreas@biessmann.org>
Sun, 26 Jun 2016 18:17:22 +0000 (20:17 +0200)
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>
arch/arm/mach-at91/spl.c

index ad6a597c7317e7c000c9f9ba8d1707e7518d0b57..98f280cbf7732c460d291a1da0e64be08ecd57f0 100644 (file)
@@ -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: