diff options
| author | Chris Packham <judge.packham@gmail.com> | 2017-08-28 20:50:46 +1200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-08 10:23:00 -0400 |
| commit | f58ad98a621ce5059d9608a9b41cfabac277094a (patch) | |
| tree | 1c784272127e30af81212822926fc91bed281135 /include/configs | |
| parent | ae3584498bf81aa3be9ae6f90fbb04e07d707276 (diff) | |
usb: net: migrate USB Ethernet adapters to Kconfig
This migrates ASIX, ASIX88179, MCS7830, RTL8152 and SMSC95XX to Kconfig.
Update defconfigs.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs')
69 files changed, 0 insertions, 138 deletions
diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 8ea7d44c7c..f16e7eb447 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -41,7 +41,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index ee47e28238..1fb4d98fe8 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -45,7 +45,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 92b64e5be1..a3ae559fef 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -40,7 +40,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 377f71ad34..8f7f26b9ed 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -62,7 +62,6 @@ /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 25f04dabcb..a3b40ab196 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -83,9 +83,6 @@ #define CONFIG_OMAP_USB3PHY1_HOST /* USB Networking options */ -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 /* CPSW Ethernet */ #define CONFIG_DRIVER_TI_CPSW diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 7b686bf248..9152c71717 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -70,9 +70,6 @@ #define CONFIG_SYS_EEPROM_SIZE 256 /* USB Networking options */ -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 /* * Miscellaneous configurable options diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 4271aca040..d51f7bd9cd 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -29,7 +29,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ #define CONFIG_IP_DEFRAG diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 11a8e2fad4..8a4ab6a3e8 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ #define CONFIG_IP_DEFRAG diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 167025eebd..89aa3ef5ea 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -37,7 +37,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index e9ac9e0167..3901fb672b 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -24,11 +24,6 @@ "stdout=serial\0" \ "stderr=serial\0" -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_RTL8152 - #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index ae8dce32fb..6b5d59d363 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -37,10 +37,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* Support all possible USB ethernet dongles */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_ASIX88179 -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX /* Extra Commands */ /* Enable that for switching of boot partitions */ diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 058db68bf3..c610981dc6 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index da854f9d34..245623049b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 26778b1bb3..2860d6bb9b 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -132,9 +132,6 @@ /* Enable Time Command */ /* USB */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_RTL8152 /* USB boot mode */ #define CONFIG_USB_BOOTING diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index f52651b4f8..e4a4c81a6b 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -30,9 +30,6 @@ #define CONFIG_USB_XHCI_EXYNOS -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_ASIX88179 - /* DRAM Memory Banks */ #define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ec5c902888..9c26059a06 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -141,8 +141,6 @@ #define CONFIG_ARP_TIMEOUT 200UL /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/harmony.h b/include/configs/harmony.h index f568d63075..9a0b1aff24 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -37,9 +37,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX #include "tegra-common-post.h" diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 150bebeea6..7eaa6e4667 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -58,8 +58,6 @@ /*#define CONFIG_DWC2_DFLT_SPEED_FULL*/ #define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MISC_INIT_R #endif diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 5b106b8093..f7836c83b0 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -36,7 +36,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 8065321c3e..74b627c31e 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -142,9 +142,6 @@ */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index ceb1cf60b2..1057b936ce 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -74,8 +74,6 @@ /* EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 /* commands to include */ diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index cf9344e48f..2efdc52ac5 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -30,7 +30,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_SMSC95XX #include "tegra-common-post.h" diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 763f304987..66c7001f09 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -93,10 +93,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) /* USB ethernet */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_RTL8152 -#define CONFIG_USB_ETHER_SMSC95XX /* * SATA/SCSI/AHCI configuration diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index a6dc6e2b86..fd60a9bfd4 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -97,10 +97,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3) /* USB ethernet */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_RTL8152 -#define CONFIG_USB_ETHER_SMSC95XX /* * SATA/SCSI/AHCI configuration diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 1f1fb246e3..36ef186510 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -37,9 +37,6 @@ #endif /* Ethernet */ -#ifdef CONFIG_CMD_NET -#define CONFIG_USB_ETHER_SMSC95XX -#endif /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 6ad0e37f0b..e191d3a8a2 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -88,8 +88,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #endif /* SPI */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 0c144c85f5..c89cb0f43b 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -73,8 +73,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI #define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index b9f4eaff14..d78a877d8e 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -46,9 +46,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 32351db200..45b9bbf403 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -43,9 +43,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index c9dc986a92..610d643712 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -128,7 +128,6 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 4b8f9c817e..64d54b6751 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -18,7 +18,6 @@ #define CONSOLE_DEV "ttymxc3" /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 3192579f73..8c06512dc7 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -60,7 +60,6 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index d48db4c000..25c83e81c5 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -157,7 +157,6 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index b73362ccb3..0cf34c477b 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -145,8 +145,6 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_RTL8152 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 7df32c5320..9e46c397a4 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -145,7 +145,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 45e807dd8c..5ef78a75ab 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -167,7 +167,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index b55b403723..593bf38d7e 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -214,7 +214,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_IMX_THERMAL diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 5b404d031b..d32d8f871a 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -67,9 +67,6 @@ #define CONFIG_FEC_MXC_PHYADDR 6 /* USB Configs */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/novena.h b/include/configs/novena.h index 5241714f6d..be8c6911e6 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -124,8 +124,6 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index f6d433f9ac..3b673827bd 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -41,7 +41,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 6378abfd81..2afb19f84a 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -183,8 +183,6 @@ /* USB */ #define CONFIG_USB_EHCI_EXYNOS -#define CONFIG_USB_ETHER_SMSC95XX - /* * Supported Odroid boards: X3, U3 * TODO: Add Odroid X support diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 408a373466..ee22f4fc1b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -52,10 +52,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX - /* commands to include */ #define MTDIDS_DEFAULT "nand0=nand" diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 794b800c50..75203b291c 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -21,7 +21,6 @@ #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62 /* USB Networking options */ -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_UBOOT_ENABLE_PADS_ALL diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 61a003a36f..38d7412099 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -58,7 +58,6 @@ /* Enabled commands */ /* USB Networking options */ -#define CONFIG_USB_ETHER_SMSC95XX #define CONSOLEDEV "ttyO2" diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 7e148e2f00..71bee208b2 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index a19750b50b..cf4dd195ff 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index a41e1f0630..73a50b14a2 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -36,7 +36,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 20014bf555..904b7f3afc 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -31,7 +31,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX #include "tegra-common-post.h" diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 3c1f4c6b0e..eef2062fd0 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -30,7 +30,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index eb4b28e2c1..1c39ed153f 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -31,7 +31,6 @@ /* USB configuration */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USB_ETHER_ASIX /* SD/MMC */ #define CONFIG_BOUNCE_BUFFER diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index df4efd48f0..9ac0df57de 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -52,10 +52,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE /* usb host */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#endif #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 7a40e2023a..5e462346be 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -74,10 +74,6 @@ #define CONFIG_ROCKCHIP_USB2_PHY /* usb host support */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#endif #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 5224b3eb61..fa9abc0a56 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -46,10 +46,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE /* usb host */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#endif #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 42dcbc9c0e..e9e3c4013c 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -62,10 +62,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE /* usb host support */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_ASIX -#endif #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index ddbc5a5f27..1d7a87271c 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -72,10 +72,4 @@ /* enable usb config for usb ether */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_ASIX88179 -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_RTL8152 - #endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index b1691aba12..c499b45b32 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -71,7 +71,6 @@ #define CONFIG_VIDEO_BCM2835 #ifdef CONFIG_CMD_USB -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_TFTP_TSIZE #define CONFIG_MISC_INIT_R #endif diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 84da723334..c0b80905cf 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -39,7 +39,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index ce24c400cf..4cbc903098 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -117,8 +117,6 @@ * */ #define CONFIG_MACB -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_MCS7830 #define CONFIG_RMII /* use reduced MII inteface */ #define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */ #define CONFIG_AT91_WANTS_COMMON_PHY diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 262d26845c..11b909b7dd 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -215,8 +215,6 @@ /* USB EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162 -#define CONFIG_USB_ETHER_SMSC95XX - #define CONFIG_USB_ETHER /* Defines for SPL */ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 8ba890bb76..3ca55ef936 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_SMSC95XX /* General networking support */ diff --git a/include/configs/tec.h b/include/configs/tec.h index 623cd6c79c..0febe466ce 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -30,7 +30,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_SMSC95XX #include "tegra-common-post.h" diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 144ef91748..238056a65f 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -20,11 +20,6 @@ "stdout=serial\0" \ "stderr=serial\0" -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX -#define CONFIG_USB_ETHER_MCS7830 -#define CONFIG_USB_ETHER_RTL8152 - #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO #define CONFIG_CMD_BMP diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 02b031653f..073f3962b7 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index f988a1d004..9c70f1b7ea 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -38,7 +38,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* PCI host support */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index aef9dd07bb..207370b3f9 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -36,7 +36,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX /* General networking support */ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index d17ab59dc7..e8457aa02b 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -29,7 +29,6 @@ #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ -#define CONFIG_USB_ETHER_ASIX #include "tegra-common-post.h" diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 63aadef9be..490dc446d6 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -75,8 +75,6 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY -#define CONFIG_USB_ETHER_SMSC95XX - #ifdef CONFIG_SYS_USE_SERIALFLASH /* bootstrap + u-boot + env + linux in serial flash */ #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 7dd3224e5f..f054c9933f 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -76,7 +76,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_ETHER_ASIX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index e220f1bccc..6422852010 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -114,8 +114,6 @@ * USB configuration */ -#define CONFIG_USB_ETHER_ASIX -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_TFTP_TSIZE #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH |