On Mon, 2018-09-17 at 15:51 +0200, Marcel Ziswiler wrote:
On Sun, 2018-09-16 at 18:23 +0100, Peter Robinson wrote:
Migrate USB_EHCI_TEGRA from headers to Kconfig
Signed-off-by: Peter Robinson pbrobinson@gmail.com Cc: Tom Warren twarren@nvidia.com Cc: Stephen Warren swarren@nvidia.com Cc: Marek Vasut marex@denx.de Cc: Marcel Ziswiler marcel.ziswiler@toradex.com Cc: Peter.Chubb@data61.csiro.au Cc: Lucas Stach dev@lynxeye.de Cc: Stefan Agner stefan.agner@toradex.com Cc: Alban Bedel alban.bedel@avionic-design.de Cc: Allen Martin amartin@nvidia.com
Looks fine to me.
Reviewed-by: Marcel Ziswiler marcel.ziswiler@toradex.com
BTW: I was wondering whether the following handling should not also better be moved into its Kconfig:
https://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/tegra-comm on -post.h;h=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hb=HEAD#l108
Sorry, of course I meant this one:
https://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/tegra-common -post.h;h=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hb=HEAD#l113
configs/apalis-tk1_defconfig | 1 + configs/apalis_t30_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/cei-tk1-som_defconfig | 1 + configs/colibri_t20_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/e2220-1170_defconfig | 1 + configs/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/nyan-big_defconfig | 1 + configs/p2371-0000_defconfig | 1 + configs/p2371-2180_defconfig | 1 + configs/p2571_defconfig | 1 + configs/paz00_defconfig | 1 + configs/plutux_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + drivers/usb/host/Kconfig | 6 ++++++ include/configs/apalis-tk1.h | 3 --- include/configs/apalis_t30.h | 3 --- include/configs/beaver.h | 3 --- include/configs/cardhu.h | 3 --- include/configs/cei-tk1-som.h | 3 --- include/configs/colibri_t20.h | 4 ---- include/configs/colibri_t30.h | 3 --- include/configs/dalmore.h | 3 --- include/configs/e2220-1170.h | 3 --- include/configs/harmony.h | 3 --- include/configs/jetson-tk1.h | 3 --- include/configs/medcom-wide.h | 3 --- include/configs/nyan-big.h | 3 --- include/configs/p2371-0000.h | 3 --- include/configs/p2371-2180.h | 3 --- include/configs/p2571.h | 3 --- include/configs/paz00.h | 3 --- include/configs/plutux.h | 3 --- include/configs/seaboard.h | 3 --- include/configs/tec-ng.h | 3 --- include/configs/tec.h | 3 --- include/configs/trimslice.h | 3 --- include/configs/venice2.h | 3 --- include/configs/ventana.h | 3 --- scripts/config_whitelist.txt | 1 - 50 files changed, 30 insertions(+), 74 deletions(-)
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis- tk1_defconfig index ca5ded8e946..10eb006ce58 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 05b1a57ff26..ac2fbc75ce7 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index d8513a0b8c8..8bf033ed4a7 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 545b3ee8db4..ab0c1d886ba 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -37,6 +37,7 @@ CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_STORAGE=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 5ea257e778d..cdb8e643480 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 496f4be0238..92d426a9927 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_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_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 07f34359d1d..e56157a4ca2 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index f07dc020786..43bb6c3f616 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/e2220-1170_defconfig b/configs/e2220- 1170_defconfig index b13ad39abe8..bd85e626c63 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index 511d455428a..d055323d809 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -40,6 +40,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_STORAGE=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson- tk1_defconfig index ba7a463d47a..cd8643266c2 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/medcom-wide_defconfig b/configs/medcom- wide_defconfig index c2cd298aaaf..726cf498bd5 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_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/nyan-big_defconfig b/configs/nyan- big_defconfig index 4a8e864b7e1..f20607b9a78 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/p2371-0000_defconfig b/configs/p2371- 0000_defconfig index 30d28f6ee5c..92040b8e68b 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/p2371-2180_defconfig b/configs/p2371- 2180_defconfig index 3ad43ff5cd8..e7e6ee032bc 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 75b7e9c5482..ea9020b19ea 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index a11e56d7c2b..394a672ba99 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_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 73524122dee..7f04f46a095 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -27,6 +27,7 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 6c56c7bdedf..917ddcce3f3 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_STORAGE=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index dd29589c5de..a1fe9c4bcef 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -32,6 +32,7 @@ CONFIG_TEGRA20_SLINK=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/tec_defconfig b/configs/tec_defconfig index 62526a7470f..840141e0ae4 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_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index c3bbe41ce61..5c389761468 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -38,6 +38,7 @@ CONFIG_TEGRA20_SFLASH=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index bcbdbe345fb..1a864990de0 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_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="NVIDIA" diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index a7c8bcd7060..e06a4fc3d9b 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_STORAGE=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index b4dd005651c..b4500a788bd 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -180,6 +180,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 controllerconfig 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 05c958a8fea..1d296ba51a0 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 254a3c4aa8c..77a5968cc2b 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 6d17750f400..a11a800a718 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 65c7d2c39b2..6b2553c73b5 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 7ba17a6fd63..74305f1b6e7 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 26d8e8eb0ed..6c4e9d41540 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 c933705de7e..7ece00e646a 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 1ae523409cc..9b25a9d59d6 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 1e917345d81..30c0c7fee78 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 7365dfeb46c..f873cea2653 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 f93c81a6d42..7b2c7947e94 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 88976fed64c..d212a7f680f 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 bb982011906..3d43839e413 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 5843cc00eb1..59866997e3f 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 3486cc8117e..c97b2260277 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 a64b6c42a5d..4920896e9cb 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 5c52a4e02b8..b76958c36d8 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 f61af5ae28d..43856bad2c1 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 53d9546dc6e..c5fa9cc4208 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 205c90ff2fa..85914ec6952 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 e40bfb9ba12..907c8d5e230 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 4e2b57c1a43..4b1eb7b1c86 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 72e6d8a5db0..a86ae212f26 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 7391262b499..09f90db1f51 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 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dbf4abc2f1b..5813e884e2f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4573,7 +4573,6 @@ CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_SPEAR CONFIG_USB_EHCI_SUNXI -CONFIG_USB_EHCI_TEGRA CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_EHCI_VCT CONFIG_USB_EHCI_VF