Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / include / asm / arch-am33xx / spl.h

diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index 570f45c3e08519fae0a0cf6ca52b8a53917859d6..95de9aa23541ab6c7953098bbeea4ede37fbb3dd 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -7,6 +7,14 @@
 #ifndef        _ASM_ARCH_SPL_H_
 #define        _ASM_SPL_H_
 
+#if defined(CONFIG_TI816X)
+#define BOOT_DEVICE_XIP                2
+#define BOOT_DEVICE_NAND       3
+#define BOOT_DEVICE_MMC1       6
+#define BOOT_DEVICE_MMC2       5
+#define BOOT_DEVICE_UART       0x43
+#define BOOT_DEVICE_MMC2_2     0xFF
+#else
 #define BOOT_DEVICE_XIP        2
 #define BOOT_DEVICE_NAND       5
 #if defined(CONFIG_AM33XX) || defined(CONFIG_AM43XX)
@@ -21,11 +29,12 @@
 #define BOOT_DEVICE_USBETH     68
 #define BOOT_DEVICE_CPGMAC     70
 #define BOOT_DEVICE_MMC2_2      0xFF
+#endif
 
 #if defined(CONFIG_AM33XX) || defined(CONFIG_AM43XX)
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
 #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2
-#elif defined(CONFIG_TI814X)
+#elif defined(CONFIG_TI81XX)
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC2
 #define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC1
 #endif