summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/include/asm/arch-mx7ulp/imx-regs.h4
-rw-r--r--arch/arm/mach-imx/mx7ulp/soc.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx7ulp/imx-regs.h b/arch/arm/include/asm/arch-mx7ulp/imx-regs.h
index 80395ae3a1..3abb166ee5 100644
--- a/arch/arm/include/asm/arch-mx7ulp/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7ulp/imx-regs.h
@@ -1152,7 +1152,9 @@ struct bootrom_sw_info {
u32 reserved_3[3];
};
-#define is_boot_from_usb(void) (!(readl(USB_PHY0_BASE_ADDR) & (1<<20)))
+#include <stdbool.h>
+bool is_usb_boot(void);
+#define is_boot_from_usb is_usb_boot
#define disconnect_from_pc(void) writel(0x0, USBOTG0_RBASE + 0x140)
#endif
diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index b35410ee6e..2981edccc3 100644
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -489,6 +489,11 @@ enum boot_device get_boot_device(void)
return boot_dev;
}
+bool is_usb_boot(void)
+{
+ return get_boot_device() == USB_BOOT;
+}
+
#if defined(CONFIG_SERIAL_TAG) || defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)
/*
* OCOTP_CFG (SJC CHALLENGE, Unique ID)