From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Sat, 14 May 2016 23:44:13 +0200 Subject: [U-Boot] [PATCH] ARM: at91: Don't invoke spl_boot_device() twice In-Reply-To: <1463262148-8858-1-git-send-email-marex@denx.de> References: <1463262148-8858-1-git-send-email-marex@denx.de> Message-ID: <57379C2D.3050307@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 05/14/2016 11:42 PM, Marek Vasut wrote: > 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 > --- > arch/arm/mach-at91/spl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This one depends on : [PATCH] common: Pass the boot device into spl_boot_mode() > diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c > index 561cf5f..236c8ec 100644 > --- a/arch/arm/mach-at91/spl.c > +++ b/arch/arm/mach-at91/spl.c > @@ -72,7 +72,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: > -- Best regards, Marek Vasut