qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs: Remove CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS in all boards 

Now that xHCD does not use CONFIG_SYS_USB_XHCI_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>
This commit is contained in:
Bin Meng 2017-07-19 21:50:04 +08:00 committed by Marek Vasut
parent 7274671e04
commit 2931342874
27 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/configs/am43xx_evm.h
View File

@ -82,7 +82,6 @@
#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB_PHY
#define CONFIG_AM437X_USB2PHY2_HOST #define CONFIG_AM437X_USB2PHY2_HOST

1
include/configs/am57xx_evm.h
View File

@ -92,7 +92,6 @@
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB_PHY
#define CONFIG_OMAP_USB3PHY1_HOST #define CONFIG_OMAP_USB3PHY1_HOST

1
include/configs/cl-som-am57x.h
View File

@ -83,7 +83,6 @@
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB_PHY
#define CONFIG_OMAP_USB3PHY1_HOST #define CONFIG_OMAP_USB3PHY1_HOST

1
include/configs/cm_t43.h
View File

@ -60,7 +60,6 @@
/* USB support */ /* USB support */
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB_PHY
#define CONFIG_AM437X_USB2PHY2_HOST #define CONFIG_AM437X_USB2PHY2_HOST

1
include/configs/dra7xx_evm.h
View File

@ -154,7 +154,6 @@
/* USB xHCI HOST */ /* USB xHCI HOST */
#define CONFIG_USB_XHCI_OMAP #define CONFIG_USB_XHCI_OMAP
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB_PHY
#define CONFIG_OMAP_USB2PHY2_HOST #define CONFIG_OMAP_USB2PHY2_HOST

1
include/configs/ds414.h
View File

@ -68,7 +68,6 @@
#if 0 #if 0
#undef CONFIG_DM_USB #undef CONFIG_DM_USB
#define CONFIG_USB_XHCI_PCI #define CONFIG_USB_XHCI_PCI
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
#if !defined(CONFIG_USB_XHCI_HCD) #if !defined(CONFIG_USB_XHCI_HCD)

1
include/configs/exynos5-common.h
View File

@ -135,7 +135,6 @@
/* USB */ /* USB */
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_HOST_ETHER #define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_ASIX

1
include/configs/ls1012afrdm.h
View File

@ -39,7 +39,6 @@
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
#define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMINFO

1
include/configs/ls1012aqds.h
View File

@ -124,7 +124,6 @@
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
/* MMC */ /* MMC */

1
include/configs/ls1012ardb.h
View File

@ -27,7 +27,6 @@
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
/* /*

1
include/configs/ls1021aiot.h
View File

@ -26,7 +26,6 @@
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_XHCI_DWC3 #define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_XHCI_USB) #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_XHCI_USB)

1
include/configs/ls1021aqds.h
View File

@ -413,7 +413,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
/* /*

1
include/configs/ls1021atwr.h
View File

@ -50,7 +50,6 @@
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
#define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_SYS_CLK_FREQ 100000000

1
include/configs/ls1043aqds.h
View File

@ -377,7 +377,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
/* /*

1
include/configs/ls1043ardb.h
View File

@ -288,7 +288,6 @@
#ifdef CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif
#endif #endif

1
include/configs/ls1046aqds.h
View File

@ -144,7 +144,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_XHCI_DWC3 #define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif

1
include/configs/ls1046ardb.h
View File

@ -220,7 +220,6 @@
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_XHCI_DWC3 #define CONFIG_USB_XHCI_DWC3
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#endif #endif

1
include/configs/ls2080aqds.h
View File

@ -446,7 +446,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#include <asm/fsl_secure_boot.h> #include <asm/fsl_secure_boot.h>

1
include/configs/ls2080ardb.h
View File

@ -346,7 +346,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#undef CONFIG_CMDLINE_EDITING #undef CONFIG_CMDLINE_EDITING
#include <config_distro_defaults.h> #include <config_distro_defaults.h>

4
include/configs/mvebu_armada-37xx.h
View File

@ -97,10 +97,8 @@
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB 3.0 */ /* USB 3.0 */
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \ #define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS) 3)
/* USB ethernet */ /* USB ethernet */
#define CONFIG_USB_HOST_ETHER #define CONFIG_USB_HOST_ETHER

4
include/configs/mvebu_armada-8k.h
View File

@ -101,10 +101,8 @@
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
/* USB 3.0 */ /* USB 3.0 */
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \ #define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS) 3)
/* USB ethernet */ /* USB ethernet */
#define CONFIG_USB_HOST_ETHER #define CONFIG_USB_HOST_ETHER

2
include/configs/rk3328_common.h
View File

@ -63,6 +63,4 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
/* xhci host */
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif

3
include/configs/rk3399_common.h
View File

@ -80,7 +80,4 @@
#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_SMSC95XX
#define CONFIG_USB_ETHER_RTL8152 #define CONFIG_USB_ETHER_RTL8152
/* rockchip xhci host driver */
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#endif #endif

1
include/configs/ti_armv7_keystone2.h
View File

@ -193,7 +193,6 @@
/* USB Configuration */ /* USB Configuration */
#define CONFIG_USB_XHCI_KEYSTONE #define CONFIG_USB_XHCI_KEYSTONE
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_SS_BASE KS2_USB_SS_BASE #define CONFIG_USB_SS_BASE KS2_USB_SS_BASE
#define CONFIG_USB_HOST_XHCI_BASE KS2_USB_HOST_XHCI_BASE #define CONFIG_USB_HOST_XHCI_BASE KS2_USB_HOST_XHCI_BASE
#define CONFIG_DEV_USB_PHY_BASE KS2_DEV_USB_PHY_BASE #define CONFIG_DEV_USB_PHY_BASE KS2_DEV_USB_PHY_BASE

3
include/configs/uniphier.h
View File

@ -101,9 +101,6 @@
#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
/* USB */
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4
/* SD/MMC */ /* SD/MMC */
#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_BOOT

2
include/configs/xilinx_zynqmp.h
View File

@ -90,8 +90,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x8000000 #define CONFIG_SYS_LOAD_ADDR 0x8000000
#if defined(CONFIG_ZYNQMP_USB) #if defined(CONFIG_ZYNQMP_USB)
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300
#define CONFIG_USB_CABLE_CHECK #define CONFIG_USB_CABLE_CHECK

1
scripts/config_whitelist.txt
View File

@ -4877,7 +4877,6 @@ CONFIG_SYS_USB_OHCI_CPU_INIT
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
CONFIG_SYS_USB_OHCI_REGS_BASE CONFIG_SYS_USB_OHCI_REGS_BASE
CONFIG_SYS_USB_OHCI_SLOT_NAME CONFIG_SYS_USB_OHCI_SLOT_NAME
CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
CONFIG_SYS_USER_SWITCHES_BASE CONFIG_SYS_USER_SWITCHES_BASE
CONFIG_SYS_USE_BOOT_NORFLASH CONFIG_SYS_USE_BOOT_NORFLASH
CONFIG_SYS_USE_DATAFLASH CONFIG_SYS_USE_DATAFLASH