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

configs: Remove CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS in all boards

Browse Source 
Now that EHCD does not use CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS,
remove it in all boards' config files.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
master
Bin Meng 8 years ago committed by Marek Vasut
parent 99c2255688
commit cbb89ed026
31 changed files with 2 additions and 61 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. 4
      arch/arm/include/asm/ehci-omap.h
  2. 1
      include/configs/MPC8572DS.h
  3. 1
      include/configs/cm_t54.h
  4. 3
      include/configs/corvus.h
  5. 2
      include/configs/duovero.h
  6. 2
      include/configs/exynos5-common.h
  7. 1
      include/configs/ma5d4evk.h
  8. 1
      include/configs/mcx.h
  9. 7
      include/configs/mvebu_armada-37xx.h
  10. 7
      include/configs/mvebu_armada-8k.h
  11. 1
      include/configs/mx35pdk.h
  12. 1
      include/configs/odroid.h
  13. 1
      include/configs/omap3_beagle.h
  14. 1
      include/configs/omap3_overo.h
  15. 2
      include/configs/omap4_panda.h
  16. 1
      include/configs/omap5_uevm.h
  17. 3
      include/configs/picosam9g45.h
  18. 1
      include/configs/poplar.h
  19. 4
      include/configs/sama5d2_ptc.h
  20. 3
      include/configs/snapper9g45.h
  21. 1
      include/configs/sunxi-common.h
  22. 1
      include/configs/tam3517-common.h
  23. 1
      include/configs/tao3530.h
  24. 1
      include/configs/tegra114-common.h
  25. 1
      include/configs/tegra124-common.h
  26. 1
      include/configs/tegra20-common.h
  27. 1
      include/configs/tegra210-common.h
  28. 1
      include/configs/tegra30-common.h
  29. 6
      include/configs/vinco.h
  30. 1
      include/configs/x86-common.h
  31. 1
      scripts/config_whitelist.txt

4
arch/arm/include/asm/ehci-omap.h
Unescape View File

@ -19,11 +19,7 @@ enum usbhs_omap_port_mode {
OMAP_EHCI_PORT_MODE_HSIC,
};
#ifdef CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS
#define OMAP_HS_USB_PORTS CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS
#else
#define OMAP_HS_USB_PORTS 3
#endif
#define is_ehci_phy_mode(x) ((x) == OMAP_EHCI_PORT_MODE_PHY)
#define is_ehci_tll_mode(x) ((x) == OMAP_EHCI_PORT_MODE_TLL)

1
include/configs/MPC8572DS.h
Unescape View File

@ -560,7 +560,6 @@
#define CONFIG_USB_EHCI_PCI
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_PCI_EHCI_DEVICE 0
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#endif
#undef CONFIG_WATCHDOG /* watchdog disabled */

1
include/configs/cm_t54.h
Unescape View File

@ -56,7 +56,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
/* USB UHH support options */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 76 /* HSIC2 HUB #RESET */

3
include/configs/corvus.h
Unescape View File

@ -94,9 +94,6 @@
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_AT91_WANTS_COMMON_PHY
/* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS

2
include/configs/duovero.h
Unescape View File

@ -25,8 +25,6 @@
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
/* USB UHH support options */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62

2
include/configs/exynos5-common.h
Unescape View File

@ -134,8 +134,6 @@
/* Enable Time Command */
/* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_USB_ETHER_SMSC95XX

1
include/configs/ma5d4evk.h
Unescape View File

@ -96,7 +96,6 @@
* USB
*/
#ifdef CONFIG_CMD_USB
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB device */
#define CONFIG_USB_ETHER

1
include/configs/mcx.h
Unescape View File

@ -74,7 +74,6 @@
/* EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_USB_ETHER_MCS7830

7
include/configs/mvebu_armada-37xx.h
Unescape View File

@ -93,12 +93,7 @@
#define CONFIG_NET_RETRY_COUNT 50
#define CONFIG_PHY_MARVELL
/* USB 2.0 */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB 3.0 */
#define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
3)
#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
/* USB ethernet */
#define CONFIG_USB_HOST_ETHER

7
include/configs/mvebu_armada-8k.h
Unescape View File

@ -97,12 +97,7 @@
#define CONFIG_ARP_TIMEOUT 200
#define CONFIG_NET_RETRY_COUNT 50
/* USB 2.0 */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB 3.0 */
#define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
3)
#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
/* USB ethernet */
#define CONFIG_USB_HOST_ETHER

1
include/configs/mx35pdk.h
Unescape View File

@ -195,7 +195,6 @@
#define CONFIG_SYS_NAND_LARGEPAGE
/* EHCI driver */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
#define CONFIG_EHCI_IS_TDI
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_USB_EHCI_MXC

1
include/configs/odroid.h
Unescape View File

@ -184,7 +184,6 @@
/* USB */
#define CONFIG_USB_EHCI_EXYNOS
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_SMSC95XX

1
include/configs/omap3_beagle.h
Unescape View File

@ -58,7 +58,6 @@
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_USB_ETHER_MCS7830

1
include/configs/omap3_overo.h
Unescape View File

@ -41,7 +41,6 @@
/* USB EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* commands to include */

2
include/configs/omap4_panda.h
Unescape View File

@ -17,8 +17,6 @@
*/
/* USB UHH support options */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62

1
include/configs/omap5_uevm.h
Unescape View File

@ -51,7 +51,6 @@
#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
/* USB UHH support options */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80

3
include/configs/picosam9g45.h
Unescape View File

@ -97,9 +97,6 @@
#define CONFIG_RESET_PHY_R
#define CONFIG_AT91_WANTS_COMMON_PHY
/* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE

1
include/configs/poplar.h
Unescape View File

@ -30,7 +30,6 @@
#define CONFIG_PL01X_SERIAL
/* USB configuration */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_USB_HOST_ETHER

4
include/configs/sama5d2_ptc.h
Unescape View File

@ -65,10 +65,6 @@
/* USB */
#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#endif
/* USB device */
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED

3
include/configs/snapper9g45.h
Unescape View File

@ -60,9 +60,6 @@
#define CONFIG_TFTP_PORT
#define CONFIG_TFTP_TSIZE
/* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
/* MMC */
#define CONFIG_GENERIC_ATMEL_MCI

1
include/configs/sunxi-common.h
Unescape View File

@ -310,7 +310,6 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_USB_OHCI_NEW
#define CONFIG_USB_OHCI_SUNXI
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
#endif
#ifdef CONFIG_USB_MUSB_SUNXI

1
include/configs/tam3517-common.h
Unescape View File

@ -67,7 +67,6 @@
115200}
/* EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* commands to include */
#define CONFIG_CMD_NAND /* NAND support */

1
include/configs/tao3530.h
Unescape View File

@ -228,7 +228,6 @@
/* USB EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_SMSC95XX

1
include/configs/tegra114-common.h
Unescape View File

@ -63,6 +63,5 @@
/* For USB EHCI controller */
#define CONFIG_EHCI_IS_TDI
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
#endif /* _TEGRA114_COMMON_H_ */

1
include/configs/tegra124-common.h
Unescape View File

@ -65,7 +65,6 @@
/* For USB EHCI controller */
#define CONFIG_EHCI_IS_TDI
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
/* GPU needs setup */
#define CONFIG_TEGRA_GPU

1
include/configs/tegra20-common.h
Unescape View File

@ -82,7 +82,6 @@
*/
#define CONFIG_USB_EHCI_TXFIFO_THRESH 10
#define CONFIG_EHCI_IS_TDI
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
#define CONFIG_SYS_NAND_SELF_INIT
#define CONFIG_SYS_NAND_ONFI_DETECTION

1
include/configs/tegra210-common.h
Unescape View File

@ -68,7 +68,6 @@
/* For USB EHCI controller */
#define CONFIG_EHCI_IS_TDI
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
/* GPU needs setup */
#define CONFIG_TEGRA_GPU

1
include/configs/tegra30-common.h
Unescape View File

@ -64,6 +64,5 @@
/* For USB EHCI controller */
#define CONFIG_EHCI_IS_TDI
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
#endif /* _TEGRA30_COMMON_H_ */

6
include/configs/vinco.h
Unescape View File

@ -63,12 +63,6 @@
#endif
/* USB */
#ifdef CONFIG_CMD_USB
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#endif
/* USB device */
#define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS

1
include/configs/x86-common.h
Unescape View File

@ -128,7 +128,6 @@
* USB configuration
*/
#define CONFIG_USB_EHCI_PCI
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12
#define CONFIG_SYS_USB_EVENT_POLL
#define CONFIG_USB_HOST_ETHER

1
scripts/config_whitelist.txt
Unescape View File

@ -4868,7 +4868,6 @@ CONFIG_SYS_UNSPEC_STRID
CONFIG_SYS_USBCTRL
CONFIG_SYS_USBD_BASE
CONFIG_SYS_USB_EHCI_CPU_INIT
CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS
CONFIG_SYS_USB_EHCI_REGS_BASE
CONFIG_SYS_USB_FAT_BOOT_PARTITION
CONFIG_SYS_USB_HOST

Write Preview
Loading…
Cancel
Save