Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert CONFIG_USB_MUSB_HCD et al to Kconfig

Browse Source 
This converts the following to Kconfig:
   CONFIG_USB_MUSB_HCD
   CONFIG_USB_MUSB_UDC
   CONFIG_USB_DAVINCI
   CONFIG_USB_OMAP3
   CONFIG_USB_DA8XX
   CONFIG_USB_AM35X

Signed-off-by: Adam Ford <aford173@gmail.com>
master
Adam Ford 6 years ago committed by Tom Rini
parent 86362221fc
commit e13a9dc370
24 changed files with 57 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      configs/am3517_crane_defconfig
  2. 2
      configs/cm_t35_defconfig
  3. 2
      configs/duovero_defconfig
  4. 3
      configs/igep0032_defconfig
  5. 3
      configs/igep00x0_defconfig
  6. 4
      configs/nokia_rx51_defconfig
  7. 1
      configs/omap3_evm_defconfig
  8. 1
      configs/omap3_logic_defconfig
  9. 3
      configs/omap3_zoom1_defconfig
  10. 2
      configs/omap4_panda_defconfig
  11. 3
      configs/omap4_sdp4430_defconfig
  12. 2
      drivers/usb/Kconfig
  13. 29
      drivers/usb/musb/Kconfig
  14. 2
      include/configs/am3517_crane.h
  15. 2
      include/configs/cm_t35.h
  16. 1
      include/configs/cm_t3517.h
  17. 2
      include/configs/eco5pk.h
  18. 3
      include/configs/nokia_rx51.h
  19. 1
      include/configs/omap3_evm.h
  20. 2
      include/configs/omap3_igep00x0.h
  21. 2
      include/configs/omap3_logic.h
  22. 2
      include/configs/omap3_zoom1.h
  23. 2
      include/configs/ti_omap4_common.h
  24. 4
      scripts/config_whitelist.txt

2
configs/am3517_crane_defconfig
Unescape View File

@ -31,4 +31,6 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
CONFIG_SPL_NAND_SIMPLE=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_MUSB_HCD=y
CONFIG_USB_AM35X=y
CONFIG_USB_STORAGE=y

2
configs/cm_t35_defconfig
Unescape View File

@ -50,6 +50,8 @@ CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_USB_STORAGE=y
CONFIG_LCD=y
CONFIG_OF_LIBFDT=y

2
configs/duovero_defconfig
Unescape View File

@ -32,6 +32,8 @@ CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_USB_STORAGE=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y

3
configs/igep0032_defconfig
Unescape View File

@ -39,6 +39,9 @@ CONFIG_SMC911X_BASE=0x2C000000
CONFIG_SMC911X_32_BIT=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_OF_LIBFDT=y

3
configs/igep00x0_defconfig
Unescape View File

@ -40,6 +40,9 @@ CONFIG_SMC911X_BASE=0x2C000000
CONFIG_SMC911X_32_BIT=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_OF_LIBFDT=y

4
configs/nokia_rx51_defconfig
Unescape View File

@ -26,6 +26,10 @@ CONFIG_CMD_FAT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_HCD=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE_ANSI=y
# CONFIG_VGA_AS_SINGLE_DEVICE is not set

1
configs/omap3_evm_defconfig
Unescape View File

@ -56,6 +56,7 @@ CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OMAP3=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_OMAP2PLUS=y
CONFIG_USB_GADGET=y

1
configs/omap3_logic_defconfig
Unescape View File

@ -50,6 +50,7 @@ CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OMAP3=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_OMAP2PLUS=y
CONFIG_USB_STORAGE=y

3
configs/omap3_zoom1_defconfig
Unescape View File

@ -41,5 +41,8 @@ CONFIG_SMC911X_BASE=0x08000000
CONFIG_SMC911X_32_BIT=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y

2
configs/omap4_panda_defconfig
Unescape View File

@ -31,6 +31,8 @@ CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y

3
configs/omap4_sdp4430_defconfig
Unescape View File

@ -27,5 +27,8 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SYS_NS16550=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_MUSB_UDC=y
CONFIG_USB_OMAP3=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y

2
drivers/usb/Kconfig
Unescape View File

@ -51,6 +51,8 @@ source "drivers/usb/host/Kconfig"
source "drivers/usb/dwc3/Kconfig"
source "drivers/usb/musb/Kconfig"
source "drivers/usb/musb-new/Kconfig"
source "drivers/usb/emul/Kconfig"

29
drivers/usb/musb/Kconfig
Unescape View File

@ -0,0 +1,29 @@
#
# (C) Copyright 2017
# Adam Ford, Logic PD, aford173@gmail.com
#
# SPDX-License-Identifier: GPL-2.0+
#
comment "Legacy MUSB Support"
config USB_MUSB_HCD
bool "Legacy MUSB Host Controller"
config USB_MUSB_UDC
bool "Legacy USB Device Controller"
config USB_DAVINCI
bool "Legacy MUSB DaVinci"
config USB_OMAP3
bool "Legacy MUSB OMAP3 / OMAP4"
depends on ARCH_OMAP2PLUS
config USB_DA8XX
bool "Legacy MUSB DA8xx/OMAP-L1x"
depends on ARCH_DAVINCI
config USB_AM35X
bool"Legacy MUSB AM35x"
depends on ARCH_OMAP2PLUS && !USB_OMAP3

2
include/configs/am3517_crane.h
Unescape View File

@ -72,8 +72,6 @@
* Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard
* Enable CONFIG_USB_MUSB_UDC for Device functionalities.
*/
#define CONFIG_USB_AM35X 1
#define CONFIG_USB_MUSB_HCD 1
#ifdef CONFIG_USB_AM35X

2
include/configs/cm_t35.h
Unescape View File

@ -72,8 +72,6 @@
115200}
/* USB */
#define CONFIG_USB_OMAP3
#define CONFIG_USB_MUSB_UDC
#define CONFIG_TWL4030_USB
/* USB device configuration */

1
include/configs/cm_t3517.h
Unescape View File

@ -80,7 +80,6 @@
/* USB */
#ifndef CONFIG_USB_MUSB_AM35X
#define CONFIG_USB_OMAP3
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
#endif /* CONFIG_USB_MUSB_AM35X */

2
include/configs/eco5pk.h
Unescape View File

@ -15,8 +15,6 @@
#include "tam3517-common.h"
#undef CONFIG_USB_OMAP3
/* Our console port is port3 */
#undef CONFIG_CONS_INDEX
#undef CONFIG_SYS_NS16550_COM1

3
include/configs/nokia_rx51.h
Unescape View File

@ -83,9 +83,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
/* USB */
#define CONFIG_USB_MUSB_UDC
#define CONFIG_USB_MUSB_HCD
#define CONFIG_USB_OMAP3
#define CONFIG_TWL4030_USB
/* USB device configuration */

1
include/configs/omap3_evm.h
Unescape View File

@ -74,7 +74,6 @@
#endif /* CONFIG_NAND */
/* MUSB */
#define CONFIG_USB_OMAP3
/* USB EHCI */
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1

2
include/configs/omap3_igep00x0.h
Unescape View File

@ -42,8 +42,6 @@
#define GPIO_IGEP00X0_REVISION_DETECTION 129
/* USB */
#define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1
#define CONFIG_TWL4030_USB 1
/* USB device configuration */

2
include/configs/omap3_logic.h
Unescape View File

@ -49,8 +49,6 @@
/* Hardware drivers */
#define CONFIG_USB_OMAP3
/* I2C */
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */

2
include/configs/omap3_zoom1.h
Unescape View File

@ -35,8 +35,6 @@
*/
/* USB */
#define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1
#define CONFIG_TWL4030_USB 1
/* USB device configuration */

2
include/configs/ti_omap4_common.h
Unescape View File

@ -61,8 +61,6 @@
#endif
/* USB */
#define CONFIG_USB_MUSB_UDC 1
#define CONFIG_USB_OMAP3 1
/* USB device configuration */
#define CONFIG_USB_DEVICE 1

4
scripts/config_whitelist.txt
Unescape View File

@ -4817,7 +4817,6 @@ CONFIG_USBD_VENDORID
CONFIG_USBID_ADDR
CONFIG_USBNET_DEV_ADDR
CONFIG_USBTTY
CONFIG_USB_AM35X
CONFIG_USB_ATMEL
CONFIG_USB_ATMEL_CLK_SEL_PLLB
CONFIG_USB_ATMEL_CLK_SEL_UPLL
@ -4878,16 +4877,13 @@ CONFIG_USB_INVENTRA_DMA
CONFIG_USB_ISP1301_I2C_ADDR
CONFIG_USB_MAX_CONTROLLER_COUNT
CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
CONFIG_USB_MUSB_HCD
CONFIG_USB_MUSB_TIMEOUT
CONFIG_USB_MUSB_TUSB6010
CONFIG_USB_MUSB_UDC
CONFIG_USB_OHCI
CONFIG_USB_OHCI_EP93XX
CONFIG_USB_OHCI_LPC32XX
CONFIG_USB_OHCI_NEW
CONFIG_USB_OHCI_SUNXI
CONFIG_USB_OMAP3
CONFIG_USB_OTG
CONFIG_USB_OTG_BLACKLIST_HUB
CONFIG_USB_PHY_CFG_BASE

Write Preview
Loading…
Cancel
Save