summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-am33xx/spl.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-24 17:52:22 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-24 17:52:22 +0100
commitb6379e15a70cc2e22486e5962927d9de374d877b (patch)
treece5c97f3754c29fa5d69a2da9b651ed59e876189 /arch/arm/include/asm/arch-am33xx/spl.h
parent536121328eae940458f065608345b5fed8286859 (diff)
parent173ddc5b68fa41e55293d1095cafdc21fd11cf65 (diff)
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-am33xx/spl.h')
-rw-r--r--arch/arm/include/asm/arch-am33xx/spl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index e961ce0578..f60b086366 100644
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -25,8 +25,13 @@
#define BOOT_DEVICE_XIP 2
#define BOOT_DEVICE_NAND 5
+#ifdef CONFIG_AM33XX
#define BOOT_DEVICE_MMC1 8
#define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */
+#elif defined(CONFIG_TI814X)
+#define BOOT_DEVICE_MMC1 9
+#define BOOT_DEVICE_MMC2 8 /* ROM only supports 2nd instance */
+#endif
#define BOOT_DEVICE_SPI 11
#define BOOT_DEVICE_UART 65
#define BOOT_DEVICE_USBETH 68