diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2012-05-18 11:09:00 +0800 |
|---|---|---|
| committer | Zhang Jiejing <jiejing.zhang@freescale.com> | 2012-05-21 09:50:11 +0800 |
| commit | fac7b6ab0e1093292c986eed053c5eb647956e4c (patch) | |
| tree | 0568a7aa51ab692c760f53d3678b9b4f4f7b11a1 | |
| parent | 500e69df9073a8bc2773274c1139bb036b1a4195 (diff) | |
| download | u-boot-imx-fac7b6ab0e1093292c986eed053c5eb647956e4c.zip u-boot-imx-fac7b6ab0e1093292c986eed053c5eb647956e4c.tar.gz u-boot-imx-fac7b6ab0e1093292c986eed053c5eb647956e4c.tar.bz2 | |
ENGR00209899-2 MX6Q: cleanup: cleanup fastboot, udc warnning.
cleanup android fastboot and udc build warnnings.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
| -rw-r--r-- | common/cmd_fastboot.c | 2 | ||||
| -rw-r--r-- | cpu/arm_cortexa8/mx6/generic.c | 10 | ||||
| -rw-r--r-- | include/usb/imx_udc.h | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c index c28f6df..660ff5c 100644 --- a/common/cmd_fastboot.c +++ b/common/cmd_fastboot.c @@ -117,6 +117,7 @@ static fastboot_ptentry ptable[MAX_PTN]; static unsigned int pcount; static int static_pcount = -1; +#ifdef CONFIG_FASTBOOT_STORAGE_NAND static void set_env(char *var, char *val) { char *setenv[4] = { "setenv", NULL, NULL, NULL, }; @@ -127,7 +128,6 @@ static void set_env(char *var, char *val) do_setenv(NULL, 0, 3, setenv); } -#ifdef CONFIG_FASTBOOT_STORAGE_NAND static void save_env(struct fastboot_ptentry *ptn, char *var, char *val) { diff --git a/cpu/arm_cortexa8/mx6/generic.c b/cpu/arm_cortexa8/mx6/generic.c index bcbaf64..43893ee 100644 --- a/cpu/arm_cortexa8/mx6/generic.c +++ b/cpu/arm_cortexa8/mx6/generic.c @@ -37,6 +37,10 @@ #include <asm/arch/regs-ocotp.h> #endif +#ifdef CONFIG_IMX_UDC +#include <usb/imx_udc.h> +#endif + #include <usb/regs-usbphy-mx6.h> enum pll_clocks { @@ -1067,7 +1071,7 @@ void enable_usb_phy1_clk(unsigned char enable) } } -void reset_usb_phy1() +void reset_usb_phy1(void) { /* Reset USBPHY module */ u32 temp; @@ -1105,7 +1109,7 @@ void set_usboh3_clk(void) #define ANDROID_RECOVERY_BOOT (1 << 7) /* check if the recovery bit is set by kernel, it can be set by kernel * issue a command '# reboot recovery' */ -int check_and_clean_recovery_flag() +int check_and_clean_recovery_flag(void) { int flag_set = 0; u32 reg; @@ -1127,7 +1131,7 @@ int check_and_clean_recovery_flag() #define ANDROID_FASTBOOT_BOOT (1 << 8) /* check if the recovery bit is set by kernel, it can be set by kernel * issue a command '# reboot fastboot' */ -int fastboot_check_and_clean_flag() +int fastboot_check_and_clean_flag(void) { int flag_set = 0; u32 reg; diff --git a/include/usb/imx_udc.h b/include/usb/imx_udc.h index 4e89d68..c3238e0 100644 --- a/include/usb/imx_udc.h +++ b/include/usb/imx_udc.h @@ -485,6 +485,11 @@ void udc_irq(void); void usb_shutdown(void); void mxc_udc_rxqueue_update(u8 ep, u32 len); int is_usb_disconnected(void); -void reset_usb_phy1(); +void reset_usb_phy1(void); +void set_usboh3_clk(void); +void set_usb_phy1_clk(void); +void enable_usb_phy1_clk(unsigned char enable); +void enable_usboh3_clk(unsigned char enable); +void udc_pins_setting(void); #endif |