| Message ID | 1505290783-353-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 2e5026a2f022f1c5ab5e879684a895ccdca7690c |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [U-Boot] usb: kbd: Set a default polling mechanism for USB keyboard | expand |
Hi Marek, Tom, On Wed, Sep 13, 2017 at 4:19 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > The choice of "USB keyboard polling" cannot be optional as without > one mechanism being set, it just doesn't work. Set the default one > to CONFIG_SYS_USB_EVENT_POLL. > > Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > configs/Cyrus_P5020_defconfig | 1 - > configs/Cyrus_P5040_defconfig | 1 - > configs/MPC8610HPCD_defconfig | 1 - > configs/MPC8641HPCN_36BIT_defconfig | 1 - > configs/MPC8641HPCN_defconfig | 1 - > configs/apalis_imx6_defconfig | 1 - > configs/apalis_imx6_nospl_com_defconfig | 1 - > configs/apalis_imx6_nospl_it_defconfig | 1 - > configs/colibri_imx6_defconfig | 1 - > configs/colibri_imx6_nospl_defconfig | 1 - > configs/firefly-rk3288_defconfig | 1 - > configs/mx6cuboxi_defconfig | 1 - > configs/rpi_2_defconfig | 1 - > configs/rpi_3_32b_defconfig | 1 - > configs/rpi_3_defconfig | 1 - > configs/rpi_defconfig | 1 - > configs/sandbox_defconfig | 1 - > configs/sandbox_flattree_defconfig | 1 - > configs/sandbox_noblk_defconfig | 1 - > configs/sandbox_spl_defconfig | 1 - > configs/seaboard_defconfig | 1 - > configs/ventana_defconfig | 1 - > drivers/usb/Kconfig | 2 +- > 23 files changed, 1 insertion(+), 23 deletions(-) > So far the USB stack is broken on several areas. Can we get this patch, as well as http://patchwork.ozlabs.org/project/uboot/list/?series=1998 applied as soon as possible? Regards, Bin
On 09/13/2017 10:19 AM, Bin Meng wrote: > The choice of "USB keyboard polling" cannot be optional as without > one mechanism being set, it just doesn't work. Set the default one > to CONFIG_SYS_USB_EVENT_POLL. > > Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Not really a usb patch, so should be applied directly to master asap. > --- > > configs/Cyrus_P5020_defconfig | 1 - > configs/Cyrus_P5040_defconfig | 1 - > configs/MPC8610HPCD_defconfig | 1 - > configs/MPC8641HPCN_36BIT_defconfig | 1 - > configs/MPC8641HPCN_defconfig | 1 - > configs/apalis_imx6_defconfig | 1 - > configs/apalis_imx6_nospl_com_defconfig | 1 - > configs/apalis_imx6_nospl_it_defconfig | 1 - > configs/colibri_imx6_defconfig | 1 - > configs/colibri_imx6_nospl_defconfig | 1 - > configs/firefly-rk3288_defconfig | 1 - > configs/mx6cuboxi_defconfig | 1 - > configs/rpi_2_defconfig | 1 - > configs/rpi_3_32b_defconfig | 1 - > configs/rpi_3_defconfig | 1 - > configs/rpi_defconfig | 1 - > configs/sandbox_defconfig | 1 - > configs/sandbox_flattree_defconfig | 1 - > configs/sandbox_noblk_defconfig | 1 - > configs/sandbox_spl_defconfig | 1 - > configs/seaboard_defconfig | 1 - > configs/ventana_defconfig | 1 - > drivers/usb/Kconfig | 2 +- > 23 files changed, 1 insertion(+), 23 deletions(-) > > diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig > index 82da854..37f78a4 100644 > --- a/configs/Cyrus_P5020_defconfig > +++ b/configs/Cyrus_P5020_defconfig > @@ -34,5 +34,4 @@ CONFIG_FSL_ESPI=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/Cyrus_P5040_defconfig b/configs/Cyrus_P5040_defconfig > index 0fc9a07..d33b514 100644 > --- a/configs/Cyrus_P5040_defconfig > +++ b/configs/Cyrus_P5040_defconfig > @@ -34,5 +34,4 @@ CONFIG_FSL_ESPI=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig > index fde837c..c71d5b1 100644 > --- a/configs/MPC8610HPCD_defconfig > +++ b/configs/MPC8610HPCD_defconfig > @@ -22,5 +22,4 @@ CONFIG_SCSI=y > CONFIG_SYS_NS16550=y > CONFIG_USB=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig > index 7318e72..9949e8b 100644 > --- a/configs/MPC8641HPCN_36BIT_defconfig > +++ b/configs/MPC8641HPCN_36BIT_defconfig > @@ -21,5 +21,4 @@ CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_USB=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig > index def36e4..c8440d2 100644 > --- a/configs/MPC8641HPCN_defconfig > +++ b/configs/MPC8641HPCN_defconfig > @@ -21,5 +21,4 @@ CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_USB=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig > index b2284ac..13f2a3b 100644 > --- a/configs/apalis_imx6_defconfig > +++ b/configs/apalis_imx6_defconfig > @@ -54,7 +54,6 @@ CONFIG_NETDEVICES=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig > index 239605d..7165749 100644 > --- a/configs/apalis_imx6_nospl_com_defconfig > +++ b/configs/apalis_imx6_nospl_com_defconfig > @@ -43,7 +43,6 @@ CONFIG_NETDEVICES=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig > index 1bc05d7..0ad7674 100644 > --- a/configs/apalis_imx6_nospl_it_defconfig > +++ b/configs/apalis_imx6_nospl_it_defconfig > @@ -43,7 +43,6 @@ CONFIG_NETDEVICES=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig > index 7d1e709..7e10086 100644 > --- a/configs/colibri_imx6_defconfig > +++ b/configs/colibri_imx6_defconfig > @@ -52,7 +52,6 @@ CONFIG_PHY_MICREL=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig > index 6877993..ba4b2dd 100644 > --- a/configs/colibri_imx6_nospl_defconfig > +++ b/configs/colibri_imx6_nospl_defconfig > @@ -41,7 +41,6 @@ CONFIG_PHY_MICREL=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > index 82da601..178c879 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -73,7 +73,6 @@ CONFIG_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig > index 5490e35..27171fb 100644 > --- a/configs/mx6cuboxi_defconfig > +++ b/configs/mx6cuboxi_defconfig > @@ -34,6 +34,5 @@ CONFIG_DM_THERMAL=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig > index 2345697..0370597 100644 > --- a/configs/rpi_2_defconfig > +++ b/configs/rpi_2_defconfig > @@ -26,7 +26,6 @@ CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_SMSC95XX=y > CONFIG_DM_VIDEO=y > diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig > index bb56a9e..31d67cc 100644 > --- a/configs/rpi_3_32b_defconfig > +++ b/configs/rpi_3_32b_defconfig > @@ -28,7 +28,6 @@ CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_SMSC95XX=y > CONFIG_DM_VIDEO=y > diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig > index 6edacd6..1ac3a96 100644 > --- a/configs/rpi_3_defconfig > +++ b/configs/rpi_3_defconfig > @@ -28,7 +28,6 @@ CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_SMSC95XX=y > CONFIG_DM_VIDEO=y > diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig > index 2e81966..87e8822 100644 > --- a/configs/rpi_defconfig > +++ b/configs/rpi_defconfig > @@ -26,7 +26,6 @@ CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_SMSC95XX=y > CONFIG_DM_VIDEO=y > diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig > index 4c4e480..c0fabb3 100644 > --- a/configs/sandbox_defconfig > +++ b/configs/sandbox_defconfig > @@ -175,7 +175,6 @@ CONFIG_DM_USB=y > CONFIG_USB_EMUL=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_DM_VIDEO=y > CONFIG_CONSOLE_ROTATION=y > CONFIG_CONSOLE_TRUETYPE=y > diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig > index 325f4ff..77cca3d 100644 > --- a/configs/sandbox_flattree_defconfig > +++ b/configs/sandbox_flattree_defconfig > @@ -161,7 +161,6 @@ CONFIG_DM_USB=y > CONFIG_USB_EMUL=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_DM_VIDEO=y > CONFIG_CONSOLE_ROTATION=y > CONFIG_CONSOLE_TRUETYPE=y > diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig > index e152917..53c2fb8 100644 > --- a/configs/sandbox_noblk_defconfig > +++ b/configs/sandbox_noblk_defconfig > @@ -169,7 +169,6 @@ CONFIG_DM_USB=y > CONFIG_USB_EMUL=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_DM_VIDEO=y > CONFIG_CONSOLE_ROTATION=y > CONFIG_CONSOLE_TRUETYPE=y > diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig > index be4a85d..0f1da0b 100644 > --- a/configs/sandbox_spl_defconfig > +++ b/configs/sandbox_spl_defconfig > @@ -179,7 +179,6 @@ CONFIG_DM_USB=y > CONFIG_USB_EMUL=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_DM_VIDEO=y > CONFIG_CONSOLE_ROTATION=y > CONFIG_CONSOLE_TRUETYPE=y > diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig > index ea4546b..810cfaa 100644 > --- a/configs/seaboard_defconfig > +++ b/configs/seaboard_defconfig > @@ -36,7 +36,6 @@ CONFIG_USB_ULPI_VIEWPORT=y > CONFIG_USB_ULPI=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_DM_VIDEO=y > diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig > index 42353f0..b11dab1 100644 > --- a/configs/ventana_defconfig > +++ b/configs/ventana_defconfig > @@ -34,7 +34,6 @@ CONFIG_USB_ULPI_VIEWPORT=y > CONFIG_USB_ULPI=y > CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -CONFIG_SYS_USB_EVENT_POLL=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_DM_VIDEO=y > diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig > index 62126aa..e7658b4 100644 > --- a/drivers/usb/Kconfig > +++ b/drivers/usb/Kconfig > @@ -75,7 +75,7 @@ if USB_KEYBOARD > > choice > prompt "USB keyboard polling" > - optional > + default SYS_USB_EVENT_POLL > ---help--- > Enable a polling mechanism for USB keyboard. > >
On 09/13/2017 10:34 AM, Bin Meng wrote: > Hi Marek, Tom, > > On Wed, Sep 13, 2017 at 4:19 PM, Bin Meng <bmeng.cn@gmail.com> wrote: >> The choice of "USB keyboard polling" cannot be optional as without >> one mechanism being set, it just doesn't work. Set the default one >> to CONFIG_SYS_USB_EVENT_POLL. >> >> Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> configs/Cyrus_P5020_defconfig | 1 - >> configs/Cyrus_P5040_defconfig | 1 - >> configs/MPC8610HPCD_defconfig | 1 - >> configs/MPC8641HPCN_36BIT_defconfig | 1 - >> configs/MPC8641HPCN_defconfig | 1 - >> configs/apalis_imx6_defconfig | 1 - >> configs/apalis_imx6_nospl_com_defconfig | 1 - >> configs/apalis_imx6_nospl_it_defconfig | 1 - >> configs/colibri_imx6_defconfig | 1 - >> configs/colibri_imx6_nospl_defconfig | 1 - >> configs/firefly-rk3288_defconfig | 1 - >> configs/mx6cuboxi_defconfig | 1 - >> configs/rpi_2_defconfig | 1 - >> configs/rpi_3_32b_defconfig | 1 - >> configs/rpi_3_defconfig | 1 - >> configs/rpi_defconfig | 1 - >> configs/sandbox_defconfig | 1 - >> configs/sandbox_flattree_defconfig | 1 - >> configs/sandbox_noblk_defconfig | 1 - >> configs/sandbox_spl_defconfig | 1 - >> configs/seaboard_defconfig | 1 - >> configs/ventana_defconfig | 1 - >> drivers/usb/Kconfig | 2 +- >> 23 files changed, 1 insertion(+), 23 deletions(-) >> > > So far the USB stack is broken on several areas. Can we get this > patch, as well as > http://patchwork.ozlabs.org/project/uboot/list/?series=1998 applied as > soon as possible? Yes
On Wed, Sep 13, 2017 at 11:45:49AM +0200, Marek Vasut wrote: > On 09/13/2017 10:34 AM, Bin Meng wrote: > > Hi Marek, Tom, > > > > On Wed, Sep 13, 2017 at 4:19 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > >> The choice of "USB keyboard polling" cannot be optional as without > >> one mechanism being set, it just doesn't work. Set the default one > >> to CONFIG_SYS_USB_EVENT_POLL. > >> > >> Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") > >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > >> --- > >> > >> configs/Cyrus_P5020_defconfig | 1 - > >> configs/Cyrus_P5040_defconfig | 1 - > >> configs/MPC8610HPCD_defconfig | 1 - > >> configs/MPC8641HPCN_36BIT_defconfig | 1 - > >> configs/MPC8641HPCN_defconfig | 1 - > >> configs/apalis_imx6_defconfig | 1 - > >> configs/apalis_imx6_nospl_com_defconfig | 1 - > >> configs/apalis_imx6_nospl_it_defconfig | 1 - > >> configs/colibri_imx6_defconfig | 1 - > >> configs/colibri_imx6_nospl_defconfig | 1 - > >> configs/firefly-rk3288_defconfig | 1 - > >> configs/mx6cuboxi_defconfig | 1 - > >> configs/rpi_2_defconfig | 1 - > >> configs/rpi_3_32b_defconfig | 1 - > >> configs/rpi_3_defconfig | 1 - > >> configs/rpi_defconfig | 1 - > >> configs/sandbox_defconfig | 1 - > >> configs/sandbox_flattree_defconfig | 1 - > >> configs/sandbox_noblk_defconfig | 1 - > >> configs/sandbox_spl_defconfig | 1 - > >> configs/seaboard_defconfig | 1 - > >> configs/ventana_defconfig | 1 - > >> drivers/usb/Kconfig | 2 +- > >> 23 files changed, 1 insertion(+), 23 deletions(-) > >> > > > > So far the USB stack is broken on several areas. Can we get this > > patch, as well as > > http://patchwork.ozlabs.org/project/uboot/list/?series=1998 applied as > > soon as possible? > > Yes Since you'll be doing a PR to me anyhow Marek, can you also please grab this patch here? Thanks!
On 09/13/2017 02:02 PM, Tom Rini wrote: > On Wed, Sep 13, 2017 at 11:45:49AM +0200, Marek Vasut wrote: >> On 09/13/2017 10:34 AM, Bin Meng wrote: >>> Hi Marek, Tom, >>> >>> On Wed, Sep 13, 2017 at 4:19 PM, Bin Meng <bmeng.cn@gmail.com> wrote: >>>> The choice of "USB keyboard polling" cannot be optional as without >>>> one mechanism being set, it just doesn't work. Set the default one >>>> to CONFIG_SYS_USB_EVENT_POLL. >>>> >>>> Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") >>>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >>>> --- >>>> >>>> configs/Cyrus_P5020_defconfig | 1 - >>>> configs/Cyrus_P5040_defconfig | 1 - >>>> configs/MPC8610HPCD_defconfig | 1 - >>>> configs/MPC8641HPCN_36BIT_defconfig | 1 - >>>> configs/MPC8641HPCN_defconfig | 1 - >>>> configs/apalis_imx6_defconfig | 1 - >>>> configs/apalis_imx6_nospl_com_defconfig | 1 - >>>> configs/apalis_imx6_nospl_it_defconfig | 1 - >>>> configs/colibri_imx6_defconfig | 1 - >>>> configs/colibri_imx6_nospl_defconfig | 1 - >>>> configs/firefly-rk3288_defconfig | 1 - >>>> configs/mx6cuboxi_defconfig | 1 - >>>> configs/rpi_2_defconfig | 1 - >>>> configs/rpi_3_32b_defconfig | 1 - >>>> configs/rpi_3_defconfig | 1 - >>>> configs/rpi_defconfig | 1 - >>>> configs/sandbox_defconfig | 1 - >>>> configs/sandbox_flattree_defconfig | 1 - >>>> configs/sandbox_noblk_defconfig | 1 - >>>> configs/sandbox_spl_defconfig | 1 - >>>> configs/seaboard_defconfig | 1 - >>>> configs/ventana_defconfig | 1 - >>>> drivers/usb/Kconfig | 2 +- >>>> 23 files changed, 1 insertion(+), 23 deletions(-) >>>> >>> >>> So far the USB stack is broken on several areas. Can we get this >>> patch, as well as >>> http://patchwork.ozlabs.org/project/uboot/list/?series=1998 applied as >>> soon as possible? >> >> Yes > > Since you'll be doing a PR to me anyhow Marek, can you also please grab > this patch here? Thanks! > Fine
diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig index 82da854..37f78a4 100644 --- a/configs/Cyrus_P5020_defconfig +++ b/configs/Cyrus_P5020_defconfig @@ -34,5 +34,4 @@ CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_OF_LIBFDT=y diff --git a/configs/Cyrus_P5040_defconfig b/configs/Cyrus_P5040_defconfig index 0fc9a07..d33b514 100644 --- a/configs/Cyrus_P5040_defconfig +++ b/configs/Cyrus_P5040_defconfig @@ -34,5 +34,4 @@ CONFIG_FSL_ESPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig index fde837c..c71d5b1 100644 --- a/configs/MPC8610HPCD_defconfig +++ b/configs/MPC8610HPCD_defconfig @@ -22,5 +22,4 @@ CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig index 7318e72..9949e8b 100644 --- a/configs/MPC8641HPCN_36BIT_defconfig +++ b/configs/MPC8641HPCN_36BIT_defconfig @@ -21,5 +21,4 @@ CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_OF_LIBFDT=y diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig index def36e4..c8440d2 100644 --- a/configs/MPC8641HPCN_defconfig +++ b/configs/MPC8641HPCN_defconfig @@ -21,5 +21,4 @@ CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_OF_LIBFDT=y diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index b2284ac..13f2a3b 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -54,7 +54,6 @@ CONFIG_NETDEVICES=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig index 239605d..7165749 100644 --- a/configs/apalis_imx6_nospl_com_defconfig +++ b/configs/apalis_imx6_nospl_com_defconfig @@ -43,7 +43,6 @@ CONFIG_NETDEVICES=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig index 1bc05d7..0ad7674 100644 --- a/configs/apalis_imx6_nospl_it_defconfig +++ b/configs/apalis_imx6_nospl_it_defconfig @@ -43,7 +43,6 @@ CONFIG_NETDEVICES=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 7d1e709..7e10086 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -52,7 +52,6 @@ CONFIG_PHY_MICREL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig index 6877993..ba4b2dd 100644 --- a/configs/colibri_imx6_nospl_defconfig +++ b/configs/colibri_imx6_nospl_defconfig @@ -41,7 +41,6 @@ CONFIG_PHY_MICREL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 82da601..178c879 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -73,7 +73,6 @@ CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index 5490e35..27171fb 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -34,6 +34,5 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 2345697..0370597 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -26,7 +26,6 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index bb56a9e..31d67cc 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -28,7 +28,6 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 6edacd6..1ac3a96 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -28,7 +28,6 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 2e81966..87e8822 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -26,7 +26,6 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 4c4e480..c0fabb3 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -175,7 +175,6 @@ CONFIG_DM_USB=y CONFIG_USB_EMUL=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 325f4ff..77cca3d 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -161,7 +161,6 @@ CONFIG_DM_USB=y CONFIG_USB_EMUL=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index e152917..53c2fb8 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -169,7 +169,6 @@ CONFIG_DM_USB=y CONFIG_USB_EMUL=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index be4a85d..0f1da0b 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -179,7 +179,6 @@ CONFIG_DM_USB=y CONFIG_USB_EMUL=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_DM_VIDEO=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index ea4546b..810cfaa 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -36,7 +36,6 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_VIDEO=y diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 42353f0..b11dab1 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -34,7 +34,6 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_USB_EVENT_POLL=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_DM_VIDEO=y diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 62126aa..e7658b4 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -75,7 +75,7 @@ if USB_KEYBOARD choice prompt "USB keyboard polling" - optional + default SYS_USB_EVENT_POLL ---help--- Enable a polling mechanism for USB keyboard.
The choice of "USB keyboard polling" cannot be optional as without one mechanism being set, it just doesn't work. Set the default one to CONFIG_SYS_USB_EVENT_POLL. Fixes: ecad7051 ("configs: Migrate all of the existing USB symbols, except fastboot") Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- configs/Cyrus_P5020_defconfig | 1 - configs/Cyrus_P5040_defconfig | 1 - configs/MPC8610HPCD_defconfig | 1 - configs/MPC8641HPCN_36BIT_defconfig | 1 - configs/MPC8641HPCN_defconfig | 1 - configs/apalis_imx6_defconfig | 1 - configs/apalis_imx6_nospl_com_defconfig | 1 - configs/apalis_imx6_nospl_it_defconfig | 1 - configs/colibri_imx6_defconfig | 1 - configs/colibri_imx6_nospl_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/mx6cuboxi_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_3_32b_defconfig | 1 - configs/rpi_3_defconfig | 1 - configs/rpi_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - configs/seaboard_defconfig | 1 - configs/ventana_defconfig | 1 - drivers/usb/Kconfig | 2 +- 23 files changed, 1 insertion(+), 23 deletions(-)