Patchwork [U-Boot] am335x/ti814x: Correct MMC_BOOT_DEVICES_START/END

login
register
mail settings
Submitter Tom Rini
Date April 9, 2013, 3:41 p.m.
Message ID <1365522093-15600-1-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/235119/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - April 9, 2013, 3:41 p.m.
Given that on TI814x we have MMC1/2 swapped, we also need to swap them
in MMC_BOOT_DEVICES_START/END

Reported-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/arm/include/asm/arch-am33xx/spl.h |    5 +++++
 1 file changed, 5 insertions(+)
Tom Rini - April 10, 2013, 8:08 p.m.
On Tue, Apr 09, 2013 at 11:41:33AM -0400, Tom Rini wrote:

> Given that on TI814x we have MMC1/2 swapped, we also need to swap them
> in MMC_BOOT_DEVICES_START/END
> 
> Reported-by: Peter Korsgaard <jacmet@sunsite.dk>
> Signed-off-by: Tom Rini <trini@ti.com>

Applied to u-boot-ti/master, thanks!

Patch

diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index 14a2c7c..4c23b27 100644
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -38,6 +38,11 @@ 
 #define BOOT_DEVICE_CPGMAC	70
 #define BOOT_DEVICE_MMC2_2      0xFF
 
+#ifdef CONFIG_AM33XX
 #define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC1
 #define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC2
+#elif defined(CONFIG_TI814X)
+#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC2
+#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC1
+#endif
 #endif