summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c2
-rw-r--r--common/main.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index b52c294..a8917b3 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -487,7 +487,7 @@ int check_1_2G(void)
(struct fuse_bank0_regs *)bank->fuse_regs;
reg = readl(&fuse_bank0->cfg3);
- if ((reg >> 16) & 0x3 == 0x3) {
+ if (((reg >> 16) & 0x3) == 0x3) {
if (ldo_bypass) {
printf("Wrong dtb file used! i.MX6Q@1.2Ghz only "
"works with ldo-enable mode!\n");
diff --git a/common/main.c b/common/main.c
index 94b3fa3..145ded1 100644
--- a/common/main.c
+++ b/common/main.c
@@ -49,6 +49,10 @@
#include <fdt_support.h>
#endif /* CONFIG_OF_LIBFDT */
+#ifdef is_boot_from_usb
+#include <environment.h>
+#endif
+
#include <post.h>
#include <linux/ctype.h>
#include <menu.h>