| Message ID | 20190405114444.8558-2-sr@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Daniel Schwierzeck |
| Headers | show |
| Series | [U-Boot,1/2] phy: Add USB PHY driver for the MT76x8 (7628/7688) SoC | expand |
Am 05.04.19 um 13:44 schrieb Stefan Roese: > This patch enables USB and file-system support on the LinkIt smart > MT7688 module for both, the normal and the RAM default config. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> > --- > configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- > configs/linkit-smart-7688_defconfig | 14 +++++++++++++- > 2 files changed, 26 insertions(+), 2 deletions(-) there are now conflicts with current master branch. Could you check and resend? > > diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig > index 2d3ab7e35c..4cb1d7a603 100644 > --- a/configs/linkit-smart-7688-ram_defconfig > +++ b/configs/linkit-smart-7688-ram_defconfig > @@ -20,17 +20,21 @@ CONFIG_CMD_MEMINFO=y > # CONFIG_CMD_FLASH is not set > CONFIG_CMD_GPIO=y > # CONFIG_CMD_LOADS is not set > +CONFIG_CMD_PART=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > +CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > CONFIG_CMD_TIME=y > +CONFIG_CMD_FS_GENERIC=y > +# CONFIG_DOS_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688" > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_NET_RANDOM_ETHADDR=y > # CONFIG_DM_DEVICE_REMOVE is not set > -CONFIG_HAVE_BLOCK_DEVICE=y > +CONFIG_BLK=y > CONFIG_CLK=y > CONFIG_LED=y > CONFIG_LED_BLINK=y > @@ -46,6 +50,7 @@ CONFIG_PHYLIB=y > CONFIG_PHY_FIXED=y > CONFIG_MT7628_ETH=y > CONFIG_PHY=y > +CONFIG_MT76X8_USB_PHY=y > CONFIG_POWER_DOMAIN=y > CONFIG_RAM=y > CONFIG_DM_RESET=y > @@ -54,5 +59,12 @@ CONFIG_SYS_NS16550=y > CONFIG_SPI=y > CONFIG_MT7621_SPI=y > CONFIG_SYSRESET_SYSCON=y > +CONFIG_USB=y > +CONFIG_DM_USB=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_STORAGE=y > +CONFIG_FS_EXT4=y > +CONFIG_FS_FAT=y > CONFIG_LZMA=y > CONFIG_LZO=y > diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig > index ad34aaf640..dd157795bd 100644 > --- a/configs/linkit-smart-7688_defconfig > +++ b/configs/linkit-smart-7688_defconfig > @@ -24,17 +24,21 @@ CONFIG_CMD_MEMINFO=y > # CONFIG_CMD_FLASH is not set > CONFIG_CMD_GPIO=y > # CONFIG_CMD_LOADS is not set > +CONFIG_CMD_PART=y > CONFIG_CMD_SF=y > CONFIG_CMD_SPI=y > +CONFIG_CMD_USB=y > CONFIG_CMD_DHCP=y > CONFIG_CMD_MII=y > CONFIG_CMD_PING=y > CONFIG_CMD_TIME=y > +CONFIG_CMD_FS_GENERIC=y > +# CONFIG_DOS_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688" > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_NET_RANDOM_ETHADDR=y > # CONFIG_DM_DEVICE_REMOVE is not set > -CONFIG_HAVE_BLOCK_DEVICE=y > +CONFIG_BLK=y > CONFIG_CLK=y > CONFIG_LED=y > CONFIG_LED_BLINK=y > @@ -50,6 +54,7 @@ CONFIG_PHYLIB=y > CONFIG_PHY_FIXED=y > CONFIG_MT7628_ETH=y > CONFIG_PHY=y > +CONFIG_MT76X8_USB_PHY=y > CONFIG_POWER_DOMAIN=y > CONFIG_RAM=y > CONFIG_DM_RESET=y > @@ -58,5 +63,12 @@ CONFIG_SYS_NS16550=y > CONFIG_SPI=y > CONFIG_MT7621_SPI=y > CONFIG_SYSRESET_SYSCON=y > +CONFIG_USB=y > +CONFIG_DM_USB=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_STORAGE=y > +CONFIG_FS_EXT4=y > +CONFIG_FS_FAT=y > CONFIG_LZMA=y > CONFIG_LZO=y >
Hi Daniel, On 10.04.19 21:36, Daniel Schwierzeck wrote: > > > Am 05.04.19 um 13:44 schrieb Stefan Roese: >> This patch enables USB and file-system support on the LinkIt smart >> MT7688 module for both, the normal and the RAM default config. >> >> Signed-off-by: Stefan Roese <sr@denx.de> >> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> >> --- >> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- >> configs/linkit-smart-7688_defconfig | 14 +++++++++++++- >> 2 files changed, 26 insertions(+), 2 deletions(-) > > there are now conflicts with current master branch. Could you check and > resend? Are you sure? I just rebased on the current master branch and it applies clean and the resulting patch is identical with the old one. Thanks, Stefan
Am 11.04.19 um 07:03 schrieb Stefan Roese: > Hi Daniel, > > On 10.04.19 21:36, Daniel Schwierzeck wrote: >> >> >> Am 05.04.19 um 13:44 schrieb Stefan Roese: >>> This patch enables USB and file-system support on the LinkIt smart >>> MT7688 module for both, the normal and the RAM default config. >>> >>> Signed-off-by: Stefan Roese <sr@denx.de> >>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> >>> --- >>> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- >>> configs/linkit-smart-7688_defconfig | 14 +++++++++++++- >>> 2 files changed, 26 insertions(+), 2 deletions(-) >> >> there are now conflicts with current master branch. Could you check and >> resend? > > Are you sure? I just rebased on the current master branch and it > applies clean and the resulting patch is identical with the old > one. > ok sorry, the conflict is only with u-boot-mips/next because of your previous patch "mips: mt76xx: linkit: Add mtd command support". I've applied the patch on u-boot-mips/next. Could you check if the conflict resolution is correct? Thanks.
On 11.04.19 09:48, Daniel Schwierzeck wrote: > > > Am 11.04.19 um 07:03 schrieb Stefan Roese: >> Hi Daniel, >> >> On 10.04.19 21:36, Daniel Schwierzeck wrote: >>> >>> >>> Am 05.04.19 um 13:44 schrieb Stefan Roese: >>>> This patch enables USB and file-system support on the LinkIt smart >>>> MT7688 module for both, the normal and the RAM default config. >>>> >>>> Signed-off-by: Stefan Roese <sr@denx.de> >>>> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> >>>> --- >>>> configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- >>>> configs/linkit-smart-7688_defconfig | 14 +++++++++++++- >>>> 2 files changed, 26 insertions(+), 2 deletions(-) >>> >>> there are now conflicts with current master branch. Could you check and >>> resend? >> >> Are you sure? I just rebased on the current master branch and it >> applies clean and the resulting patch is identical with the old >> one. >> > > ok sorry, the conflict is only with u-boot-mips/next because of your > previous patch "mips: mt76xx: linkit: Add mtd command support". I see. > I've applied the patch on u-boot-mips/next. Could you check if the > conflict resolution is correct? Thanks. Patch looks good in your tree. So please continue with it. Thanks, Stefan
diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig index 2d3ab7e35c..4cb1d7a603 100644 --- a/configs/linkit-smart-7688-ram_defconfig +++ b/configs/linkit-smart-7688-ram_defconfig @@ -20,17 +20,21 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set +CONFIG_CMD_PART=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_CMD_FS_GENERIC=y +# CONFIG_DOS_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y # CONFIG_DM_DEVICE_REMOVE is not set -CONFIG_HAVE_BLOCK_DEVICE=y +CONFIG_BLK=y CONFIG_CLK=y CONFIG_LED=y CONFIG_LED_BLINK=y @@ -46,6 +50,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_FIXED=y CONFIG_MT7628_ETH=y CONFIG_PHY=y +CONFIG_MT76X8_USB_PHY=y CONFIG_POWER_DOMAIN=y CONFIG_RAM=y CONFIG_DM_RESET=y @@ -54,5 +59,12 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_MT7621_SPI=y CONFIG_SYSRESET_SYSCON=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_STORAGE=y +CONFIG_FS_EXT4=y +CONFIG_FS_FAT=y CONFIG_LZMA=y CONFIG_LZO=y diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig index ad34aaf640..dd157795bd 100644 --- a/configs/linkit-smart-7688_defconfig +++ b/configs/linkit-smart-7688_defconfig @@ -24,17 +24,21 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set +CONFIG_CMD_PART=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_CMD_FS_GENERIC=y +# CONFIG_DOS_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="linkit-smart-7688" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y # CONFIG_DM_DEVICE_REMOVE is not set -CONFIG_HAVE_BLOCK_DEVICE=y +CONFIG_BLK=y CONFIG_CLK=y CONFIG_LED=y CONFIG_LED_BLINK=y @@ -50,6 +54,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_FIXED=y CONFIG_MT7628_ETH=y CONFIG_PHY=y +CONFIG_MT76X8_USB_PHY=y CONFIG_POWER_DOMAIN=y CONFIG_RAM=y CONFIG_DM_RESET=y @@ -58,5 +63,12 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_MT7621_SPI=y CONFIG_SYSRESET_SYSCON=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_STORAGE=y +CONFIG_FS_EXT4=y +CONFIG_FS_FAT=y CONFIG_LZMA=y CONFIG_LZO=y
This patch enables USB and file-system support on the LinkIt smart MT7688 module for both, the normal and the RAM default config. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> --- configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- configs/linkit-smart-7688_defconfig | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)