arm: layerscape: Remove CONFIG_USB_MAX_CONTROLLER_COUNT

Because COMFIG_DM_USB has been enabled and will not use it anymore.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 2e9c619bd52d41526e04d94b8b4b97bb80ced1a4..efb4c00cd91e0b1eae73317ac5ed82b575265b7d 100644 (file)
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -31,11 +31,6 @@
        "kernel_load=0x96000000\0"              \
        "kernel_size=0x2800000\0"
 
-/*
-* USB
-*/
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         1
-
 #define CONFIG_CMD_MEMINFO
 #define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       0x80000000

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 70bf72c431477a6c3236f2f856298907e621d854..ffb512db455abe68f312c8c2e365d4cbd3558ec5 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -118,9 +118,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
 
-/*XHCI Support - enabled by default*/
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         1
-
 /*  MMC  */
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 110fcc63238d427ebbca7a525874b61507510b71..0caa47463699b170ed76d277449bf0d24601c67e 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -19,10 +19,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         0x9fffffff
 
-/*
-* USB
-*/
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 
 /*
  * I2C IO expander

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 7c7f82f215afa540933b55c2007e3e266638114d..46bf55f89171fdd638fab6506e56f2c7f8f1a5c4 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -19,9 +19,6 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
 
-/* XHCI Support - enabled by default */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 #define CONFIG_SYS_CLK_FREQ            100000000
 #define CONFIG_DDR_CLK_FREQ            100000000
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 8346e3658f014ae05f289df820b58c579d4a7a2b..6669f2f9602af0b6f038c11509cb32e53c930188 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -404,9 +404,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
 
-/*XHCI Support - enabled by default*/
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
-
 /*
  * Video
  */

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 8ccc81642d60836c59137d7a512001e23c084283..0f20e5e2cc8e1b6b8aebad8aabbd11dc69d97d2d 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -44,9 +44,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
 
-/* XHCI Support - enabled by default */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
-
 #define CONFIG_SYS_CLK_FREQ            100000000
 #define CONFIG_DDR_CLK_FREQ            100000000
 

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 641ffc1400e22cc03513658e1ddb2c3cd2e85a80..8cc2abb2b6bd3ed46336622fc885b5164392cabb 100644 (file)
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -370,9 +370,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 #endif
 
-/* USB */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                3
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 489f50c5b131a438380d02863ab508ac20d55c58..b4b4d5e178fb6e2eddaba8976bad575cf7695038 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -284,11 +284,6 @@
 #endif
 #endif
 
-/* USB */
-#ifndef SPL_NO_USB
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                3
-#endif
-
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 7778f86881b4679193423d6140c281fe41442fc5..586e9e9b6b3e1ce744c11eae1bc0255928765aeb 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -136,9 +136,6 @@ unsigned long get_board_ddr_clk(void);
 #define CFG_LPUART_EN          0x2
 #endif
 
-/* USB */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         3
-
 /* SATA */
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 40ce8ff4623b3df3da83ae2d75e40eff47318ab3..bb27dd058a45d9e791228bff970de6e55d5e4896 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -209,11 +209,6 @@
 #endif
 #endif
 
-/* USB */
-#ifndef SPL_NO_USB
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         3
-#endif
-
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 5dd1ff206544ea5cc5f0c8cac660e8037caaef07..f1968cc53353506490411ffa32d2ac144071a21a 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -435,11 +435,6 @@ unsigned long get_board_ddr_clk(void);
 
 #endif
 
-/*
- * USB
- */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-
 #include <asm/fsl_secure_boot.h>
 
 #endif /* __LS2_QDS_H */

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index eef78f21b6366164ef2aa8f990028d04b49d1e3a..48c3a5397f7464250f77267afed9eb046a2f95c9 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -333,11 +333,6 @@ unsigned long get_board_sys_clk(void);
 
 #define CONFIG_MISC_INIT_R
 
-/*
- * USB
- */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         2
-
 #undef CONFIG_CMDLINE_EDITING
 #include <config_distro_defaults.h>