diff options
Diffstat (limited to 'board/freescale/mx6slevk/mx6slevk.c')
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index dda3f68..93e56c1 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -34,12 +34,12 @@ #include <lcd.h> #include <mxc_epdc_fb.h> #endif -#ifdef CONFIG_FASTBOOT -#include <fastboot.h> +#ifdef CONFIG_FSL_FASTBOOT +#include <fsl_fastboot.h> #ifdef CONFIG_ANDROID_RECOVERY #include <recovery.h> #endif -#endif /*CONFIG_FASTBOOT*/ +#endif /*CONFIG_FSL_FASTBOOT*/ DECLARE_GLOBAL_DATA_PTR; @@ -873,7 +873,7 @@ int setup_mxc_kpd(void) } #endif /*CONFIG_MXC_KPD*/ -#ifdef CONFIG_FASTBOOT +#ifdef CONFIG_FSL_FASTBOOT void board_fastboot_setup(void) { @@ -884,21 +884,21 @@ void board_fastboot_setup(void) if (!getenv("fastboot_dev")) setenv("fastboot_dev", "mmc0"); if (!getenv("bootcmd")) - setenv("bootcmd", "booti mmc0"); + setenv("bootcmd", "boota mmc0"); break; case SD2_BOOT: case MMC2_BOOT: if (!getenv("fastboot_dev")) setenv("fastboot_dev", "mmc1"); if (!getenv("bootcmd")) - setenv("bootcmd", "booti mmc1"); + setenv("bootcmd", "boota mmc1"); break; case SD3_BOOT: case MMC3_BOOT: if (!getenv("fastboot_dev")) setenv("fastboot_dev", "mmc2"); if (!getenv("bootcmd")) - setenv("bootcmd", "booti mmc2"); + setenv("bootcmd", "boota mmc2"); break; #endif /*CONFIG_FASTBOOT_STORAGE_MMC*/ default: @@ -925,19 +925,19 @@ void board_recovery_setup(void) case MMC1_BOOT: if (!getenv("bootcmd_android_recovery")) setenv("bootcmd_android_recovery", - "booti mmc0 recovery"); + "boota mmc0 recovery"); break; case SD2_BOOT: case MMC2_BOOT: if (!getenv("bootcmd_android_recovery")) setenv("bootcmd_android_recovery", - "booti mmc1 recovery"); + "boota mmc1 recovery"); break; case SD3_BOOT: case MMC3_BOOT: if (!getenv("bootcmd_android_recovery")) setenv("bootcmd_android_recovery", - "booti mmc2 recovery"); + "boota mmc2 recovery"); break; #endif /*CONFIG_FASTBOOT_STORAGE_MMC*/ default: @@ -952,15 +952,4 @@ void board_recovery_setup(void) #endif /*CONFIG_ANDROID_RECOVERY*/ -#endif /*CONFIG_FASTBOOT*/ - -#ifdef CONFIG_IMX_UDC -iomux_v3_cfg_t const otg_udc_pads[] = { - (MX6_PAD_EPDC_PWRCOM__ANATOP_USBOTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; -void udc_pins_setting(void) -{ - imx_iomux_v3_setup_multiple_pads(otg_udc_pads, - ARRAY_SIZE(otg_udc_pads)); -} -#endif /*CONFIG_IMX_UDC*/ +#endif /*CONFIG_FSL_FASTBOOT*/ |