diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 9219e5984ded1952fad90e634d9dc244139fbf87..cf239ec3ec2ee7e83118a370cc7e9839f375d8de 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -47,6 +47,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index fa5b657c5e3d391deb9c529b7669595df3f6c12e..71e77777980089abe6d582a9ff1d25e2e49da0a7 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 29b074f2811c54df05999151c6c080cb72ffc963..51843ce2d4aac7310a34431b9831e13961367210 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -43,6 +43,7 @@ CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 0c49dfb2f2241003fa1838b1b749dd7beac75173..20f4a300550886eed8ef1b15451e1a383b4e7e0b 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -37,5 +37,6 @@ CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index 5f0fbbd4b7d25588da15716ac6b54ee347397fc8..bd318466680e340832b98bfbf691a9a826b42489 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -46,6 +46,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 7e680d79c49cb088f537bc8eb5095ae2ee66da8b..1487b22f18ce84a9e1899bbd8f94fa71f366e458 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index b6054c7fd95d68d8cbacfdca6fcfd778d32e497a..106f0460f6fdc615e018298537d2a01626e2b9cd 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -33,6 +33,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index cc494048818691564bbcfbd3c1602e7c7715d6b6..c03a8514c2e6a82b18a6532079b2890fba865935 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -37,6 +37,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index 2d45ee309afe1c73802a5babca756007e593877a..fbca72ace6edb18753608a37cb0cabe44f631b96 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -32,6 +32,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index f0987fc064c8b66d33c9c4cdd150f6c1fe2933e7..1b89580b823b1bd5b33ca6b7afc8014c8cdcf49c 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_HOST_ETHER=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 57accff45251b3e3a32b28c5d205a808c997db40..a7dd360f0ff906bb437d56e95a64cb037d8fcc0b 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -47,6 +47,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index a55d8d4cfae08090030d5be9183528be2d6a3290..0a3250988a17d77647d65c343bfb959abf3b8416 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_DM_VIDEO=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 4199e92451346cef1f231c8fee7998880a465ccc..2a0e1071997958015fd7033df101901246b9e881 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -64,6 +64,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 6d06c0bbb1ee11a09bacc56745a5158e7bbb4d23..c25872128e07156cbf03b501adfdd1752adb0867 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -33,6 +33,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index db4a9225f2c52250334de5a84f636b5acfde6ca4..b662ef1431415b042dd77996a290a10ef2a71428 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -40,6 +40,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index fabc1ca6f21b7180482d2ad3edab37cdb4f709eb..5f0f8c519b4ccdb82a7c8288fe15969b6da1ec13 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -33,6 +33,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index dc785c88657c16f5e860eb25553e44b7f6833dd2..f23773c37ed92dba8b242215502699d994ec4e31 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_DM_VIDEO=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 05b388cce3b615c39710292458f179b2610e08fa..318eada004ae23bea86e95fc5e01d48bb9105da3 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -27,5 +27,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 62ab59d6e52f05377a0c0b7408a522409333065c..304a292133ba6b66f45a9b72acb74fb9e61d9952 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_KEYBOARD=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 1fd54eeb6fb36d45d66cf1630cd4c80b07f3db3f..c6b9333d86fd8bc61085af2bc0f5808484e386bd 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -32,5 +32,6 @@ CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index c5bb4955af57bf834bc6a94e0ee260d4acf78a84..7017aade6860f6d80ca4ce0c325c786630bff8e0 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -32,6 +32,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_DM_VIDEO=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 82bd13ea007edf4c4273ab9d7f64832e85e293cb..8d92bedb95d2b8f3d969026f6dba02836a05a61c 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -38,5 +38,6 @@ CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 296989af1bdcf26cfca0397c3146e8cca3ad6e5d..0c66338a283e90789fce8932a67e3d8520b68f3c 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -36,6 +36,7 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 2d63b219cf02677d111e44641942540c74863ebd..4cb0fef51a6811ef37688c8c86f7c7cb04a0bc17 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -29,6 +29,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_KEYBOARD=y
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 60f37f40fd920b0f96061874a70ba8184c14b691..ba1e6bfa43b5b9f2977c2db9bedded3a1fb5b0aa 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -179,6 +179,12 @@ config USB_EHCI_PCI
 	help
 	  Enables support for the PCI-based EHCI controller.
 
+config USB_EHCI_TEGRA
+	bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
+	depends on TEGRA
+	---help---
+	  Enable support for Tegra on-chip EHCI USB controller
+
 config USB_EHCI_ZYNQ
 	bool "Support for Xilinx Zynq on-chip EHCI USB controller"
 	depends on ARCH_ZYNQ
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 05c958a8fea8ca84aa7be1fc0f0540a535c97104..1d296ba51a05edbd35f966b52c187340911f4d43 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -27,9 +27,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_SYS_MMC_ENV_PART		1
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* PCI host support */
 #undef CONFIG_PCI_SCAN_SHOW
 
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 254a3c4aa8c7aee56cbba8c6fed908b32e8a2298..77a5968cc2b229f438e1584258b2a2ebc91c6d9a 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -24,9 +24,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_SYS_MMC_ENV_PART		1
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* PCI networking support */
 #define CONFIG_E1000_NO_NVM
 
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6d17750f400e880cac1ff5ff47356f6f9afc0b55..a11a800a7182e37b55633ee9f1b70b034946407c 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -33,9 +33,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 65c7d2c39b226c1796cf6bc55a845eb2866d103e..6b2553c73b51d5ea6254ce17a3e69beeb6c2586b 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -37,9 +37,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 7ba17a6fd63922cc3dbfdf2d60b62bc810db042b..74305f1b6e7b7ddb1c68ca1c31029387310613e4 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -32,9 +32,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 26d8e8eb0edbf1a4230e4911b204146651bd38a7..6c4e9d415404222966b977f55f31dff60d329ddb 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -17,10 +17,6 @@
 
 #define CONFIG_MACH_TYPE		MACH_TYPE_COLIBRI_TEGRA2
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT	3
-
 /* General networking support */
 #define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		1536
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index c933705de7e306c81551cb67dc759493b7ab79b8..7ece00e646ac406c57f5dc614c958bc324ccd14f 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -26,9 +26,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0
 #define CONFIG_SYS_MMC_ENV_PART		1
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* General networking support */
 #define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE		16352
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 1ae523409cc6b5f9163c37351e6754134502456f..9b25a9d59d6385a658a7a97fb26c0fa984db08d2 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -29,9 +29,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index 1e917345d811e42be5be7b8ca77bd72211189872..30c0c7fee781cf7779d7b15667c338430cfd99c7 100644
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -27,9 +27,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB2.0 Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 7365dfeb46c68c07e2f304a8bc6b5b1befa07172..f873cea26533b751f829974342cce5cd64902c6d 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -32,9 +32,6 @@
 /* Environment in NAND (which is 512M), aligned to start of last sector */
 #define CONFIG_ENV_OFFSET	(SZ_512M - SZ_128K) /* 128K sector size */
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index f93c81a6d4208c284e550441dfcc1dbfc048f755..7b2c7947e944105ceb986170db60606408649286 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -28,9 +28,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 88976fed64c093084b0f2a8160f5dac7b89de575..d212a7f680fe5c89dee59a0415950c544ace592d 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -25,9 +25,6 @@
 /* Environment in NAND, aligned to start of last sector */
 #define CONFIG_ENV_OFFSET		(SZ_512M - SZ_128K) /* 128K sectors */
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index bb9820119065521da27a9355b41b998636ba8bc4..3d43839e413750bf9098a8aad9c9c2075bf57f73 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -31,9 +31,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #define CONFIG_KEYBOARD
 
 #undef CONFIG_LOADADDR
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 5843cc00eb1d96151d9fb5a32e6bc59625a7b524..59866997e3f3f3adff7789ad3ce08e84dfd4f551 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -27,9 +27,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB2.0 Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 3486cc8117e4c499e48b3b58dfce50f9b5a965a4..c97b2260277ad2686ab597e4be68cc797d050c60 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -27,9 +27,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB2.0 Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index a64b6c42a5d9dc5ad97830b45ec2910278e7229e..4920896e9cbb69fd38e34981a2272676e9c63ae0 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -28,9 +28,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		24000000
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)
 
-/* USB2.0 Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 5c52a4e02b86fd241671db2b5e88f6c9852624fa..b76958c36d808c4689c08c11dfc2e57631ee4d19 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -26,9 +26,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV 0
 #define CONFIG_SYS_MMC_ENV_PART 2
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index f61af5ae28db233a03ce7a1d74c069a08c039910..43856bad2c1a9eef5d60159c86865aaac4b39d16 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -25,9 +25,6 @@
 /* Environment in NAND, aligned to start of last sector */
 #define CONFIG_ENV_OFFSET		(SZ_512M - SZ_128K) /* 128K sectors */
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 53d9546dc6efb33659e691bf0c52297ec0a64737..c5fa9cc4208be11510960ba6d38ca285cf9ce0fd 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -31,9 +31,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV 0
 #define CONFIG_SYS_MMC_ENV_PART 2
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* Enable keyboard */
 #define CONFIG_TEGRA_KEYBOARD
 #define CONFIG_KEYBOARD
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 205c90ff2fa61852a2424e9ca42648fe20b45fc6..85914ec695233d001a620743c7110e460dfad7ff 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -27,9 +27,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* Tag support */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/tec.h b/include/configs/tec.h
index e40bfb9ba12248f81d8ea1b055b78dc75ee96124..907c8d5e2301d0874bfc6d04fc7521e8cfb5d499 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -25,9 +25,6 @@
 /* Environment in NAND, aligned to start of last sector */
 #define CONFIG_ENV_OFFSET		(SZ_512M - SZ_128K) /* 128K sectors */
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 4e2b57c1a4352dede6951b71fdd3614a3cdef6f0..4b1eb7b1c86b0cbccd07080d32b97a693133eca7 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -30,9 +30,6 @@
 /* 1MiB flash, environment located as high as possible */
 #define CONFIG_ENV_OFFSET		(SZ_1M - CONFIG_ENV_SIZE)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 72e6d8a5db019af1a251fb2f24b42a3d75064304..a86ae212f265c2d0dbf54a5c92177c9c31950069 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -28,9 +28,6 @@
 #define CONFIG_SF_DEFAULT_SPEED        24000000
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 7391262b4993578a1c0fb98b574df97b3b46c2d9..09f90db1f51545852383964afe3fcd350c663e17 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -24,9 +24,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV 0
 #define CONFIG_SYS_MMC_ENV_PART 2
 
-/* USB Host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */