summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-mx7/imx-regs.h8
-rw-r--r--arch/arm/include/asm/mach-imx/boot_mode.h9
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h
index a421b9bc04..3726f02af5 100644
--- a/arch/arm/include/asm/arch-mx7/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7/imx-regs.h
@@ -1210,14 +1210,6 @@ extern void pcie_power_off(void);
readl(USBOTG2_IPS_BASE_ADDR + 0x158))
#define disconnect_from_pc(void) writel(0x0, USBOTG1_IPS_BASE_ADDR + 0x140)
-/* Boot device type */
-#define BOOT_TYPE_SD 0x1
-#define BOOT_TYPE_MMC 0x2
-#define BOOT_TYPE_NAND 0x3
-#define BOOT_TYPE_QSPI 0x4
-#define BOOT_TYPE_WEIM 0x5
-#define BOOT_TYPE_SPINOR 0x6
-
struct bootrom_sw_info {
u8 reserved_1;
u8 boot_dev_instance;
diff --git a/arch/arm/include/asm/mach-imx/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h
index e3ed046b25..300868a45e 100644
--- a/arch/arm/include/asm/mach-imx/boot_mode.h
+++ b/arch/arm/include/asm/mach-imx/boot_mode.h
@@ -31,6 +31,15 @@ enum boot_device {
BOOT_DEV_NUM = UNKNOWN_BOOT,
};
+/* Boot device type */
+#define BOOT_TYPE_SD 0x1
+#define BOOT_TYPE_MMC 0x2
+#define BOOT_TYPE_NAND 0x3
+#define BOOT_TYPE_QSPI 0x4
+#define BOOT_TYPE_WEIM 0x5
+#define BOOT_TYPE_SPINOR 0x6
+#define BOOT_TYPE_USB 0xF
+
struct boot_mode {
const char *name;
unsigned cfg_val;