summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-am33xx/spl.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 08:51:41 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-04-12 08:51:41 +0200
commitc97b6df1ae92679d67f94c1cfef51323782a506d (patch)
tree8b99745ad084fc5e62afd0a14cb4bbb428f288a5 /arch/arm/include/asm/arch-am33xx/spl.h
parent60442b303958237d845e16fc07fe78992e09d6a7 (diff)
parenteef6da0326834cc90b9f3b2e80dec71ee8e39e9a (diff)
downloadu-boot-imx-c97b6df1ae92679d67f94c1cfef51323782a506d.zip
u-boot-imx-c97b6df1ae92679d67f94c1cfef51323782a506d.tar.gz
u-boot-imx-c97b6df1ae92679d67f94c1cfef51323782a506d.tar.bz2
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 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