openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

A defconfig update for omap2plus_defconfig to fix changed USB 

Kconfig dependencies for v4.8 merge window. Otherwise things
 like USB Ethernet on omap3 beagle, omap4 panda and omap5-uevm
 won't work without manual configuration.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXg1ijAAoJEBvUPslcq6VzG4YP/1fHehNHXf/+JgAHFbpL2hm+
 57fpjnmxnB7maFGdhz72PKP1vi4APyZUrgzOxuft4IcVgAN71jTeO8B5Oj2ROAn7
 TyB99ob5OJ7/uzUSOsIUSDvGw+F0+bL6jj2X7vBphPF740QY3wOacchVBXzOLewc
 QN9PfivuJDLmk1+rm9iFZcO7uIOBiIiUH3D+KwIcWt2M4EfFMNJZlXYK+vHwCXOJ
 xCRBXzV53wNOZYcEdRSW2qPJ1qnZGbx4N4NybAGmjeREPpgP9sJxE4sHcdnTR8hR
 AymoNJa/5GPK0qnRik1MkOLRNrGnOi89zn36LTJnmZ+mDrqp6yBpYrGw+I6yJ2Kc
 rspkgDitjklQQHu0DdXojtxXNKaU9aAhKdlc7ILD/LMaAjAgiDMRegohZ3mFbpOH
 KeUpuC1C8YclNwvGSV1ZizQzFESP3MGLx9j/THFnr5k6Ef5N70L8Yo+jvhMw6mxY
 YBmi5dcY+xqds5SOGbbkLfnbqEJzJwV5gYKgQ2qIGxkSpP3PHxAtao+LSUT5U2it
 N4FJi4Aqv2V04A3NCxd2zYxqPukxaIR93wpWV7YgfpAfhMPbz88LIZBnj9c3Fe9X
 EtPikpDhXu4aJV/BSiqOPYKrvWmcpXPI/1pNBt1unA9DG/heBLrwp6igwWgzXInh
 +ZwKaZ/5AJlyVphgsO0r
 =8O1H
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/defconfig-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Merge "omap2plus_defconfig fix for v4.8 merge window" from Tony Lindgren:

A defconfig update for omap2plus_defconfig to fix changed USB
Kconfig dependencies for v4.8 merge window. Otherwise things
like USB Ethernet on omap3 beagle, omap4 panda and omap5-uevm
won't work without manual configuration.

* tag 'omap-for-v4.8/defconfig-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
This commit is contained in:
Arnd Bergmann 2016-07-14 15:16:02 +02:00
parent fa3533e778 0992b2f16b
commit 772a7f2297
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/configs/omap2plus_defconfig
View File

@ -355,11 +355,13 @@ CONFIG_USB_OHCI_HCD=m
CONFIG_USB_WDM=m
CONFIG_USB_STORAGE=m
CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_OMAP2PLUS=m
CONFIG_USB_MUSB_AM35X=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_INVENTRA_DMA=y
CONFIG_USB_TI_CPPI41_DMA=y
CONFIG_USB_TUSB_OMAP_DMA=y
CONFIG_USB_DWC3=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
@ -367,7 +369,8 @@ CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_TEST=m
CONFIG_AM335X_PHY_USB=y
CONFIG_NOP_USB_XCEIV=m
CONFIG_AM335X_PHY_USB=m
CONFIG_TWL6030_USB=m
CONFIG_USB_GADGET=m
CONFIG_USB_GADGET_DEBUG=y