diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-09 14:03:10 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-17 11:13:50 +0800 |
| commit | ef39118d8172657f7dc9b3087e11a01a296716b6 (patch) | |
| tree | 8b03923a079b64df35e31f7b1386e2b4554337fd /board/freescale | |
| parent | 0b67ab303873c6e3be0e8cc83175efd740c94c5c (diff) | |
| download | u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.zip u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.tar.gz u-boot-imx-ef39118d8172657f7dc9b3087e11a01a296716b6.tar.bz2 | |
ENGR00315894-41 i.mx6:sabresd/sabreauto/slevk Fix build break for android support
Add the android header file "mx6slevkandroid.h" for imx6slevk android support.
Fix header file and pin name problems in BSP codes.
Remove build warning in cmd_fastboot.c
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 2 | ||||
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index 0fd9e77..f06599f 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -920,7 +920,7 @@ void board_fastboot_setup(void) #define GPIO_VOL_DN_KEY IMX_GPIO_NR(5, 14) iomux_v3_cfg_t const recovery_key_pads[] = { - (MX6_PAD_DISP0_DAT20__GPIO_5_14 | MUX_PAD_CTRL(NO_PAD_CTRL)), + (MX6_PAD_DISP0_DAT20__GPIO5_IO14 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; int check_recovery_cmd_file(void) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 6a6c405..d4486ed 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -14,6 +14,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/boot_mode.h> #include <asm/io.h> #include <linux/sizes.h> #include <common.h> @@ -28,6 +29,13 @@ #include <lcd.h> #include <mxc_epdc_fb.h> #endif +#ifdef CONFIG_FASTBOOT +#include <fastboot.h> +#ifdef CONFIG_ANDROID_RECOVERY +#include <recovery.h> +#endif +#endif /*CONFIG_FASTBOOT*/ + DECLARE_GLOBAL_DATA_PTR; |