diff options
| author | Robin Gong <b38343@freescale.com> | 2013-11-14 16:53:29 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2013-11-14 17:44:45 +0800 |
| commit | 466cb7451c75e405db4af07106cc707cbb62b1f5 (patch) | |
| tree | 5d99c8db1eda2166f850e0de1e531bc4dcc8c74a | |
| parent | 15ecf2d35389137fbae090672a095825bc4d57e1 (diff) | |
| download | u-boot-imx-466cb7451c75e405db4af07106cc707cbb62b1f5.zip u-boot-imx-466cb7451c75e405db4af07106cc707cbb62b1f5.tar.gz u-boot-imx-466cb7451c75e405db4af07106cc707cbb62b1f5.tar.bz2 | |
ENGR00288025 imx6: fix build warnings
Fix below two warning:
soc.c: In function 'check_1_2G':
soc.c:488:2: warning: suggest parentheses around comparison in operand of
'&' [-Wparentheses]
main.c: In function 'main_loop':
main.c:444:3: warning: implicit declaration of function 'set_default_env'
[-Wimplicit-function-declaration]
set_default_env("Use default environment for mfgtools\n");
Signed-off-by: Robin Gong <b38343@freescale.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 2 | ||||
| -rw-r--r-- | common/main.c | 4 |
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> |