Merge branch 'next'

[oweals/u-boot.git] / arch / arm / include / asm / arch-omap4 / spl.h

diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h
index 551b27df14798ca67a0d7632e144030d6cd50055..bace92dae8f18432fe377e174f3ec962b5d43eb9 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/spl.h
+++ b/arch/arm/include/asm/arch-omap4/spl.h
@@ -5,17 +5,19 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef        _ASM_ARCH_SPL_H_
-#define        _ASM_SPL_H_
+#define        _ASM_ARCH_SPL_H_
 
-#define BOOT_DEVICE_NONE       0
-#define BOOT_DEVICE_XIP                1
-#define BOOT_DEVICE_XIPWAIT    2
-#define BOOT_DEVICE_NAND       3
-#define BOOT_DEVICE_ONENAND    4
-#define BOOT_DEVICE_MMC1       5
-#define BOOT_DEVICE_MMC2       6
-#define BOOT_DEVICE_MMC2_2     0xFF
+#define BOOT_DEVICE_NONE       0x00
+#define BOOT_DEVICE_XIP                0x01
+#define BOOT_DEVICE_XIPWAIT    0x02
+#define BOOT_DEVICE_NAND       0x03
+#define BOOT_DEVICE_ONENAND    0x04
+#define BOOT_DEVICE_MMC1       0x05
+#define BOOT_DEVICE_MMC2       0x06
+#define BOOT_DEVICE_MMC2_2     0x07
+#define BOOT_DEVICE_UART       0x43
+#define BOOT_DEVICE_USB                0x45
 
 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
-#define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2
+#define MMC_BOOT_DEVICES_END   BOOT_DEVICE_MMC2_2
 #endif