[U-Boot] [PATCH] 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 --- arch/arm/mach-at91/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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:
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 marex@denx.de Cc: Andreas Bießmann andreas.devel@googlemail.com
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:
On 14.05.16 23:42, 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 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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:
Dear Marek Vasut,
Marek Vasut marex@denx.de writes:
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
applied to u-boot-atmel/master, thanks!
Best regards, Andreas Bießmann
participants (2)
-
Andreas Bießmann -
Marek Vasut