Message ID | 1555166271-29847-1-git-send-email-pjtexier@koncepto.io |
---|---|
State | Changes Requested |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot] warp7: defconfig: Switch to DM for USB and SERIAL | expand |
Hi Pierre-Jean, On Sat, Apr 13, 2019 at 11:38 AM Pierre-Jean Texier <pjtexier@koncepto.io> wrote: > > -int board_usb_phy_mode(int port) > -{ > - return USB_INIT_DEVICE; > -} > - It seems that #include <usb.h> can also be removed now. I still see uart related code in the warp7.c board file. Can they also be removed? Could #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR be removed from include/configs/warp7.h?
On Sat, Apr 13, 2019 at 1:31 PM Fabio Estevam <festevam@gmail.com> wrote: > It seems that #include <usb.h> can also be removed now. > > I still see uart related code in the warp7.c board file. > > Can they also be removed? > > Could #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR be removed from > include/configs/warp7.h? Also, when sending a v2, please split this patch in two: one for serial and another one for USB. Thanks
Hi Fabio, Le 13/04/2019 à 18:31, Fabio Estevam a écrit : > Hi Pierre-Jean, > > On Sat, Apr 13, 2019 at 11:38 AM Pierre-Jean Texier > <pjtexier@koncepto.io> wrote: > >> -int board_usb_phy_mode(int port) >> -{ >> - return USB_INIT_DEVICE; >> -} >> - > It seems that #include <usb.h> can also be removed now. > > I still see uart related code in the warp7.c board file. > > Can they also be removed? If we remove uart related code in warp7.c, the log of the u-boot appears late here is a log PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 MMC: FSL_SDHC: 1, FSL_SDHC: 0 Loading Environment from MMC... OK In: serial@30860000 Out: serial@30860000 Err: serial@30860000 SEC0: RNG instantiated Net: usb_ether Hit any key to stop autoboot: 0 => > > Could #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR be removed from > include/configs/warp7.h? Yes it can be deleted Best Regards, Joris > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index d28b7ec..db5ef67 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -19,6 +19,11 @@ aliases { mmc0 = &usdhc3; + usb0 = &usbotg1; + }; + + chosen { + stdout-path = &uart1; }; gpio-keys { diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 2882dc9..797e09c 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -128,11 +128,6 @@ int checkboard(void) return 0; } -int board_usb_phy_mode(int port) -{ - return USB_INIT_DEVICE; -} - int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 6eaf152..4308c64 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -38,7 +38,9 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 28aa06f..3f7863b 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -47,8 +47,10 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_OPTEE=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_GADGET=y