Skip to contentSkip to conversation

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

PATCH In review Marek Vasut 2 participants 4 messages May 14, 2016 – Jun 26, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Andreas Bie?mann <[email protected]>
---
 arch/arm/mach-at91/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/spl.c +1 -1
index 561cf5f..236c8ec 100644
@@ -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:
Signature · 1 line
2.7.0
author
#1 lore raw

PATCH 1/1 ARM: at91: Don't invoke spl_boot_device() twice

Quoted 9 lines · Marek Vasut

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 <[email protected]>
Cc Andreas Bie?mann <[email protected]>
---
 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()

Quoted 14 lines
arch/arm/mach-at91/spl.c +1 -1
index 561cf5f..236c8ec 100644
@@ -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:
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 ARM: at91: Don't invoke spl_boot_device() twice

In reply to Marek Vasut
Quoted 6 lines · Marek Vasut

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 <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Reviewed-by Andreas Bie?mann <[email protected]>
Quoted 18 lines
---
 arch/arm/mach-at91/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/spl.c +1 -1
index 561cf5f..236c8ec 100644
@@ -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:
#3 lore raw
In reply to Marek Vasut

Dear Marek Vasut,

Quoted 10 lines · Marek Vasut

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 <[email protected]>
Cc Andreas Bie?mann <[email protected]>
Reviewed-by Andreas Bie?mann <[email protected]>

---
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