* [U-Boot] Some tegra cleanups and Kconfig migrations
@ 2018-09-16 17:22 Peter Robinson
2018-09-16 17:22 ` [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs Peter Robinson
` (6 more replies)
0 siblings, 7 replies; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:22 UTC (permalink / raw)
To: u-boot
The following patches are a few cleanups to dangling comments from Kconfig
cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD.
There's also a couple of other minors fixes and cleanups as well.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
@ 2018-09-16 17:22 ` Peter Robinson
2018-09-17 10:00 ` Marcel Ziswiler
2018-09-16 17:22 ` [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value Peter Robinson
` (5 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:22 UTC (permalink / raw)
To: u-boot
There's a number of dangling comments in various tegra configs post migrations
of various configs so lets clean them up.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Peter.Chubb at 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>
---
include/configs/apalis-tk1.h | 2 --
include/configs/apalis_t30.h | 4 ----
include/configs/beaver.h | 6 ------
include/configs/cardhu.h | 6 ------
include/configs/cei-tk1-som.h | 6 ------
include/configs/colibri_t20.h | 6 ------
include/configs/colibri_t30.h | 2 --
include/configs/dalmore.h | 4 ----
include/configs/e2220-1170.h | 4 ----
include/configs/harmony.h | 4 ----
include/configs/jetson-tk1.h | 6 ------
include/configs/medcom-wide.h | 2 --
include/configs/nyan-big.h | 4 ----
include/configs/p2371-0000.h | 4 ----
include/configs/p2371-2180.h | 6 ------
include/configs/p2571.h | 4 ----
include/configs/p2771-0000.h | 2 --
include/configs/paz00.h | 2 --
include/configs/plutux.h | 4 ----
include/configs/seaboard.h | 2 --
include/configs/tec-ng.h | 4 ----
include/configs/tec.h | 2 --
include/configs/tegra-common.h | 6 ------
include/configs/tegra210-common.h | 4 ----
include/configs/tegra30-common.h | 4 ----
include/configs/trimslice.h | 6 ------
include/configs/venice2.h | 4 ----
include/configs/ventana.h | 2 --
28 files changed, 112 deletions(-)
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 667d0846118..506a9e4f2fe 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -14,8 +14,6 @@
#define CONFIG_ARCH_MISC_INIT
-/* High-level configuration options */
-
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 646086a9566..ac012225a77 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -12,8 +12,6 @@
#include "tegra30-common.h"
-/* High-level configuration options */
-
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
@@ -32,8 +30,6 @@
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
-/* PCI host support */
-
/* PCI networking support */
#define CONFIG_E1000_NO_NVM
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 73629ddeb00..8ea583ddfc4 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -39,12 +39,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index dcb66a6f9a3..2ad93204443 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -43,12 +43,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#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 14008440dae..b595c482632 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -38,12 +38,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#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 4a18c72a533..c34d6d055c3 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -10,8 +10,6 @@
#include "tegra20-common.h"
-/* High-level configuration options */
-
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1
@@ -26,8 +24,6 @@
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
-/* USB networking support */
-
/* General networking support */
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 1536
@@ -40,8 +36,6 @@
#define CONFIG_TEGRA_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Dynamic MTD partition support */
-
/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
#define CONFIG_ENV_OFFSET (SZ_2M)
#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 908b3bde3e0..6b1a831da9a 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -32,8 +32,6 @@
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
/* 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 9a8b5a73574..afd2dd2f64c 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -35,10 +35,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#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 dd7a01290ae..6fe2f667957 100644
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -33,10 +33,6 @@
/* USB2.0 Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index fc5ed5b2fd8..7365dfeb46c 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -29,16 +29,12 @@
#define CONFIG_TEGRA_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1
-/* Dynamic MTD partition support */
-
/* 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
-/* USB networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 93fcdd6bcc5..192d821d4b2 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -34,12 +34,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#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 b290df58915..88976fed64c 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -28,8 +28,6 @@
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index dd76829e91a..4a0de707335 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -37,10 +37,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#define CONFIG_KEYBOARD
#undef CONFIG_LOADADDR
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 6654a1b4df8..9e22bbb8cf4 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -33,10 +33,6 @@
/* USB2.0 Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#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 0e37511daf4..76c11ad7a0c 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -33,12 +33,6 @@
/* USB2.0 Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 1daf49a4535..5e34f22618f 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -34,10 +34,6 @@
/* USB2.0 Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index cfe8d8cbede..e8be81a66cf 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -21,8 +21,6 @@
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
-/* PCI host support */
-
#define BOARD_EXTRA_ENV_SETTINGS \
"calculated_vars=kernel_addr_r fdt_addr_r scriptaddr pxefile_addr_r " \
"ramdisk_addr_r\0" \
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 447f99af685..5c52a4e02b8 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -29,8 +29,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 125a1f1f434..f61af5ae28d 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -28,10 +28,6 @@
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index b8d02f03973..ef3848d6df0 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -37,8 +37,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
/* Enable keyboard */
#define CONFIG_TEGRA_KEYBOARD
#define CONFIG_KEYBOARD
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index dd3e026b148..998e353c5e5 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -33,10 +33,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
/* Tag support */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/tec.h b/include/configs/tec.h
index a40212190ab..e40bfb9ba12 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -28,8 +28,6 @@
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 4d249ddfd27..e6b180f8fbc 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -39,15 +39,9 @@
*/
#define CONFIG_SYS_MMC_MAX_DEVICE 4
-/*
- * select serial console configuration
- */
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-/* turn on command-line edit/hist/auto */
-
/*
* Increasing the size of the IO buffer as default nfsargs size is more
* than 256 and so it is not possible to edit it
diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index 16b962db640..1c533118ad0 100644
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -14,10 +14,6 @@
*/
#define V_NS16550_CLK 408000000 /* 408MHz (pllp_out0) */
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-
/* Generic Interrupt Controller */
#define CONFIG_GICV2
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 70964a90cea..2c7a1852aed 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -18,10 +18,6 @@
*/
#define CONFIG_STACKBASE 0x82800000 /* 40MB */
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-
/*
* Memory layout for where various images get loaded by boot scripts:
*
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 427da1c1c22..8972e1738a5 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -36,12 +36,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* PCI host support */
-
-/* General networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index e542187efcd..8bb74aae1b1 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -34,10 +34,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
-/* General networking support */
-
#include "tegra-common-usb-gadget.h"
#include "tegra-common-post.h"
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3f9db3303fd..7391262b499 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -27,8 +27,6 @@
/* USB Host support */
#define CONFIG_USB_EHCI_TEGRA
-/* USB networking support */
-
#include "tegra-common-post.h"
#endif /* __CONFIG_H */
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
2018-09-16 17:22 ` [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs Peter Robinson
@ 2018-09-16 17:22 ` Peter Robinson
2018-09-17 10:10 ` Marcel Ziswiler
2018-09-16 17:22 ` [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA Peter Robinson
` (4 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:22 UTC (permalink / raw)
To: u-boot
All other Tegra devices that define USB_EHCI_TXFIFO_THRESH use hex
representation, fix tegra20 to be the same format.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
---
include/configs/tegra20-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 7f0a5292c2e..3551616cd1e 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -78,7 +78,7 @@
* parameter, the default (2) causes occasional Data Buffer Errors in OUT
* packets depending on the buffer address and size.
*/
-#define CONFIG_USB_EHCI_TXFIFO_THRESH 10
+#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
#define CONFIG_EHCI_IS_TDI
#define CONFIG_SYS_NAND_SELF_INIT
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
2018-09-16 17:22 ` [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs Peter Robinson
2018-09-16 17:22 ` [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value Peter Robinson
@ 2018-09-16 17:22 ` Peter Robinson
2018-09-17 13:52 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA Peter Robinson
` (3 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:22 UTC (permalink / raw)
To: u-boot
Migrate SYS_I2C_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: Heiko Schocher <hs@denx.de>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Peter.Chubb at 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>
---
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/jetson-tk1_defconfig | 1 +
configs/nyan-big_defconfig | 1 +
configs/p2371-0000_defconfig | 1 +
configs/p2371-2180_defconfig | 1 +
configs/p2571_defconfig | 1 +
configs/p2771-0000-000_defconfig | 1 +
configs/p2771-0000-500_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/trimslice_defconfig | 1 +
configs/venice2_defconfig | 1 +
drivers/i2c/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 | 3 ---
include/configs/colibri_t30.h | 3 ---
include/configs/dalmore.h | 3 ---
include/configs/e2220-1170.h | 3 ---
include/configs/jetson-tk1.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/p2771-0000.h | 3 ---
include/configs/seaboard.h | 3 ---
include/configs/tec-ng.h | 3 ---
include/configs/trimslice.h | 3 ---
include/configs/venice2.h | 3 ---
scripts/config_whitelist.txt | 1 -
41 files changed, 26 insertions(+), 58 deletions(-)
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 83721b403b5..ca5ded8e946 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 0e6547b72c4..05b1a57ff26 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 28cb04c38be..d8513a0b8c8 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index c046ef5d8be..545b3ee8db4 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index c782fef89e9..5ea257e778d 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index dcb2bcf617b..496f4be0238 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -33,6 +33,7 @@ CONFIG_CMD_UBI=y
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index c8b82a9b582..07f34359d1d 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 9c08aadc0d1..f07dc020786 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index 89035a051d6..b13ad39abe8 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_SF=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 76f3376e3ce..ba7a463d47a 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index ae6d76dfb20..4a8e864b7e1 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -41,6 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_LIVE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 02a75692051..30d28f6ee5c 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_SF=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index d9dcf7e014e..3ad43ff5cd8 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_SF=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_RTL8169=y
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 5cbb1c3201a..75b7e9c5482 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_DFU_SF=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index 2bf2e313599..ac85efa37b3 100644
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_TEGRA186_BPMP_I2C=y
CONFIG_DWC_ETH_QOS=y
CONFIG_E1000=y
diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index 1e33c1f95b0..df4d914d85c 100644
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_TEGRA186_BPMP_I2C=y
CONFIG_DWC_ETH_QOS=y
CONFIG_E1000=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 69e159b43e1..6c56c7bdedf 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 65ac1c2e5b1..dd29589c5de 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 6dfb3fbda80..c3bbe41ce61 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 12043180c00..bcbdbe345fb 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
+CONFIG_SYS_I2C_TEGRA=y
CONFIG_SPL_DM=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index ae3b5015551..b45d09823c6 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -400,6 +400,12 @@ config SYS_I2C_STM32F7
_ Optional clock stretching
_ Software reset
+config SYS_I2C_TEGRA
+ bool "NVIDIA Tegra internal I2C controller"
+ depends on TEGRA
+ help
+ Support for NVIDIA I2C controller available in Tegra SoCs.
+
config SYS_I2C_UNIPHIER
bool "UniPhier I2C driver"
depends on ARCH_UNIPHIER && DM_I2C
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 506a9e4f2fe..05c958a8fea 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -18,9 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* SD/MMC support */
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index ac012225a77..254a3c4aa8c 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -18,9 +18,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, before config block at the end of 1st "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
CONFIG_TDX_CFG_BLOCK_OFFSET)
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 8ea583ddfc4..6d17750f400 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -22,9 +22,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 2ad93204443..65c7d2c39b2 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -26,9 +26,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index b595c482632..7ba17a6fd63 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -22,9 +22,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index c34d6d055c3..26d8e8eb0ed 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -17,9 +17,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* USB host support */
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 6b1a831da9a..c933705de7e 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -20,9 +20,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, before config block at the end of 1st "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
CONFIG_TDX_CFG_BLOCK_OFFSET)
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index afd2dd2f64c..1ae523409cc 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -19,9 +19,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_DALMORE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index 6fe2f667957..1e917345d81 100644
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -17,9 +17,6 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 192d821d4b2..f93c81a6d42 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -18,9 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 4a0de707335..bb982011906 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -18,9 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 9e22bbb8cf4..5843cc00eb1 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -17,9 +17,6 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 76c11ad7a0c..3486cc8117e 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -17,9 +17,6 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 5e34f22618f..a64b6c42a5d 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -18,9 +18,6 @@
#define CONFIG_SERIAL_MULTI
#define CONFIG_TEGRA_ENABLE_UARTA
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index e8be81a66cf..e546c1d73fd 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -13,9 +13,6 @@
/* High-level configuration options */
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index ef3848d6df0..53d9546dc6e 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -26,9 +26,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 998e353c5e5..205c90ff2fa 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -16,9 +16,6 @@
#define CONFIG_TEGRA_ENABLE_UARTD
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 8972e1738a5..4e2b57c1a43 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -23,9 +23,6 @@
/* SPI */
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in SPI */
#define CONFIG_ENV_SPI_MAX_HZ 48000000
#define CONFIG_ENV_SPI_MODE SPI_MODE_0
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 8bb74aae1b1..72e6d8a5db0 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -18,9 +18,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
/* Environment in eMMC, at the end of 2nd "boot sector" */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc37099cbe0..dbf4abc2f1b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3179,7 +3179,6 @@ CONFIG_SYS_I2C_SPEED2
CONFIG_SYS_I2C_SPEED3
CONFIG_SYS_I2C_TCA642X_ADDR
CONFIG_SYS_I2C_TCA642X_BUS_NUM
-CONFIG_SYS_I2C_TEGRA
CONFIG_SYS_I2C_W83782G_ADDR
CONFIG_SYS_IBAT
CONFIG_SYS_IBAT0L
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
` (2 preceding siblings ...)
2018-09-16 17:22 ` [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA Peter Robinson
@ 2018-09-16 17:23 ` Peter Robinson
2018-09-17 13:51 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD Peter Robinson
` (2 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:23 UTC (permalink / raw)
To: u-boot
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 at 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>
---
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 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 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
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
` (3 preceding siblings ...)
2018-09-16 17:23 ` [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA Peter Robinson
@ 2018-09-16 17:23 ` Peter Robinson
2018-09-17 13:59 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD Peter Robinson
2018-11-07 14:12 ` [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:23 UTC (permalink / raw)
To: u-boot
Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard uses it but we
drop CONFIG_KEYBOARD as the driver doesn't use the legacy drv_keyboard_init.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
---
configs/seaboard_defconfig | 1 +
drivers/input/Kconfig | 6 ++++++
include/configs/seaboard.h | 4 ----
scripts/config_whitelist.txt | 1 -
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 917ddcce3f3..f9638e6016d 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_I2C_TEGRA=y
+CONFIG_TEGRA_KEYBOARD=y
CONFIG_SPL_DM=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 7ffb949f12d..a1353848c22 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -25,6 +25,12 @@ config I8042_KEYB
variable 'keymap' to "de" to select German. Keyboard repeat is
handled by the keyboard itself.
+config TEGRA_KEYBOARD
+ bool "NVIDIA Tegra internal matrix keyboard controller support"
+ help
+ A matrix keyboard connected directly to the internal keyboard
+ controller on Tegra SoCs.
+
config TWL4030_INPUT
bool "Enable TWL4030 Input controller"
help
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index c5fa9cc4208..5df013b0b32 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -31,10 +31,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
-/* Enable keyboard */
-#define CONFIG_TEGRA_KEYBOARD
-#define CONFIG_KEYBOARD
-
/* NAND support */
#define CONFIG_TEGRA_NAND
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5813e884e2f..3dc14a2dd92 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4436,7 +4436,6 @@ CONFIG_TEGRA_ENABLE_UARTC
CONFIG_TEGRA_ENABLE_UARTD
CONFIG_TEGRA_ENABLE_UARTE
CONFIG_TEGRA_GPU
-CONFIG_TEGRA_KEYBOARD
CONFIG_TEGRA_LP0
CONFIG_TEGRA_NAND
CONFIG_TEGRA_PMU
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
` (4 preceding siblings ...)
2018-09-16 17:23 ` [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD Peter Robinson
@ 2018-09-16 17:23 ` Peter Robinson
2018-09-17 14:04 ` Marcel Ziswiler
2018-11-07 14:12 ` [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-09-16 17:23 UTC (permalink / raw)
To: u-boot
The CONFIG_KEYBOARD does nothing as it's legacy and unused
so just drop it from the config.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Allen Martin <amartin@nvidia.com>
---
include/configs/nyan-big.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 3d43839e413..933f84028f4 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -31,8 +31,6 @@
#define CONFIG_SF_DEFAULT_SPEED 24000000
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
-#define CONFIG_KEYBOARD
-
#undef CONFIG_LOADADDR
#define CONFIG_LOADADDR 0x82408000
--
2.19.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs
2018-09-16 17:22 ` [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs Peter Robinson
@ 2018-09-17 10:00 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 10:00 UTC (permalink / raw)
To: u-boot
On Sun, 2018-09-16 at 18:22 +0100, Peter Robinson wrote:
> There's a number of dangling comments in various tegra configs post
> migrations
> of various configs so lets clean them up.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Peter.Chubb at 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>
Makes perfect sense.
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> include/configs/apalis-tk1.h | 2 --
> include/configs/apalis_t30.h | 4 ----
> include/configs/beaver.h | 6 ------
> include/configs/cardhu.h | 6 ------
> include/configs/cei-tk1-som.h | 6 ------
> include/configs/colibri_t20.h | 6 ------
> include/configs/colibri_t30.h | 2 --
> include/configs/dalmore.h | 4 ----
> include/configs/e2220-1170.h | 4 ----
> include/configs/harmony.h | 4 ----
> include/configs/jetson-tk1.h | 6 ------
> include/configs/medcom-wide.h | 2 --
> include/configs/nyan-big.h | 4 ----
> include/configs/p2371-0000.h | 4 ----
> include/configs/p2371-2180.h | 6 ------
> include/configs/p2571.h | 4 ----
> include/configs/p2771-0000.h | 2 --
> include/configs/paz00.h | 2 --
> include/configs/plutux.h | 4 ----
> include/configs/seaboard.h | 2 --
> include/configs/tec-ng.h | 4 ----
> include/configs/tec.h | 2 --
> include/configs/tegra-common.h | 6 ------
> include/configs/tegra210-common.h | 4 ----
> include/configs/tegra30-common.h | 4 ----
> include/configs/trimslice.h | 6 ------
> include/configs/venice2.h | 4 ----
> include/configs/ventana.h | 2 --
> 28 files changed, 112 deletions(-)
>
> diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-
> tk1.h
> index 667d0846118..506a9e4f2fe 100644
> --- a/include/configs/apalis-tk1.h
> +++ b/include/configs/apalis-tk1.h
> @@ -14,8 +14,6 @@
>
> #define CONFIG_ARCH_MISC_INIT
>
> -/* High-level configuration options */
> -
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
> diff --git a/include/configs/apalis_t30.h
> b/include/configs/apalis_t30.h
> index 646086a9566..ac012225a77 100644
> --- a/include/configs/apalis_t30.h
> +++ b/include/configs/apalis_t30.h
> @@ -12,8 +12,6 @@
>
> #include "tegra30-common.h"
>
> -/* High-level configuration options */
> -
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
> @@ -32,8 +30,6 @@
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* PCI host support */
> -
> /* PCI networking support */
> #define CONFIG_E1000_NO_NVM
>
> diff --git a/include/configs/beaver.h b/include/configs/beaver.h
> index 73629ddeb00..8ea583ddfc4 100644
> --- a/include/configs/beaver.h
> +++ b/include/configs/beaver.h
> @@ -39,12 +39,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #include "tegra-common-usb-gadget.h"
> #include "tegra-common-post.h"
>
> diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
> index dcb66a6f9a3..2ad93204443 100644
> --- a/include/configs/cardhu.h
> +++ b/include/configs/cardhu.h
> @@ -43,12 +43,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #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 14008440dae..b595c482632 100644
> --- a/include/configs/cei-tk1-som.h
> +++ b/include/configs/cei-tk1-som.h
> @@ -38,12 +38,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #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 4a18c72a533..c34d6d055c3 100644
> --- a/include/configs/colibri_t20.h
> +++ b/include/configs/colibri_t20.h
> @@ -10,8 +10,6 @@
>
> #include "tegra20-common.h"
>
> -/* High-level configuration options */
> -
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_TEGRA_UARTA_SDIO1
> @@ -26,8 +24,6 @@
> #define CONFIG_USB_EHCI_TEGRA
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
>
> -/* USB networking support */
> -
> /* General networking support */
> #define CONFIG_IP_DEFRAG
> #define CONFIG_TFTP_BLOCKSIZE 1536
> @@ -40,8 +36,6 @@
> #define CONFIG_TEGRA_NAND
> #define CONFIG_SYS_MAX_NAND_DEVICE 1
>
> -/* Dynamic MTD partition support */
> -
> /* Environment in NAND, 64K is a bit excessive but erase block is
> 512K anyway */
> #define CONFIG_ENV_OFFSET (SZ_2M)
> #undef CONFIG_ENV_SIZE /* undef size from tegra20-
> common.h */
> diff --git a/include/configs/colibri_t30.h
> b/include/configs/colibri_t30.h
> index 908b3bde3e0..6b1a831da9a 100644
> --- a/include/configs/colibri_t30.h
> +++ b/include/configs/colibri_t30.h
> @@ -32,8 +32,6 @@
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> /* 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 9a8b5a73574..afd2dd2f64c 100644
> --- a/include/configs/dalmore.h
> +++ b/include/configs/dalmore.h
> @@ -35,10 +35,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #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 dd7a01290ae..6fe2f667957 100644
> --- a/include/configs/e2220-1170.h
> +++ b/include/configs/e2220-1170.h
> @@ -33,10 +33,6 @@
> /* USB2.0 Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #include "tegra-common-usb-gadget.h"
> #include "tegra-common-post.h"
>
> diff --git a/include/configs/harmony.h b/include/configs/harmony.h
> index fc5ed5b2fd8..7365dfeb46c 100644
> --- a/include/configs/harmony.h
> +++ b/include/configs/harmony.h
> @@ -29,16 +29,12 @@
> #define CONFIG_TEGRA_NAND
> #define CONFIG_SYS_MAX_NAND_DEVICE 1
>
> -/* Dynamic MTD partition support */
> -
> /* 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
>
> -/* USB networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-
> tk1.h
> index 93fcdd6bcc5..192d821d4b2 100644
> --- a/include/configs/jetson-tk1.h
> +++ b/include/configs/jetson-tk1.h
> @@ -34,12 +34,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #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 b290df58915..88976fed64c 100644
> --- a/include/configs/medcom-wide.h
> +++ b/include/configs/medcom-wide.h
> @@ -28,8 +28,6 @@
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
> index dd76829e91a..4a0de707335 100644
> --- a/include/configs/nyan-big.h
> +++ b/include/configs/nyan-big.h
> @@ -37,10 +37,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #define CONFIG_KEYBOARD
>
> #undef CONFIG_LOADADDR
> diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-
> 0000.h
> index 6654a1b4df8..9e22bbb8cf4 100644
> --- a/include/configs/p2371-0000.h
> +++ b/include/configs/p2371-0000.h
> @@ -33,10 +33,6 @@
> /* USB2.0 Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #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 0e37511daf4..76c11ad7a0c 100644
> --- a/include/configs/p2371-2180.h
> +++ b/include/configs/p2371-2180.h
> @@ -33,12 +33,6 @@
> /* USB2.0 Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #include "tegra-common-usb-gadget.h"
> #include "tegra-common-post.h"
>
> diff --git a/include/configs/p2571.h b/include/configs/p2571.h
> index 1daf49a4535..5e34f22618f 100644
> --- a/include/configs/p2571.h
> +++ b/include/configs/p2571.h
> @@ -34,10 +34,6 @@
> /* USB2.0 Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #include "tegra-common-usb-gadget.h"
> #include "tegra-common-post.h"
>
> diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-
> 0000.h
> index cfe8d8cbede..e8be81a66cf 100644
> --- a/include/configs/p2771-0000.h
> +++ b/include/configs/p2771-0000.h
> @@ -21,8 +21,6 @@
> #define CONFIG_SYS_MMC_ENV_PART 2
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
>
> -/* PCI host support */
> -
> #define BOARD_EXTRA_ENV_SETTINGS \
> "calculated_vars=kernel_addr_r fdt_addr_r scriptaddr
> pxefile_addr_r " \
> "ramdisk_addr_r\0" \
> diff --git a/include/configs/paz00.h b/include/configs/paz00.h
> index 447f99af685..5c52a4e02b8 100644
> --- a/include/configs/paz00.h
> +++ b/include/configs/paz00.h
> @@ -29,8 +29,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/plutux.h b/include/configs/plutux.h
> index 125a1f1f434..f61af5ae28d 100644
> --- a/include/configs/plutux.h
> +++ b/include/configs/plutux.h
> @@ -28,10 +28,6 @@
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index b8d02f03973..ef3848d6df0 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -37,8 +37,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> /* Enable keyboard */
> #define CONFIG_TEGRA_KEYBOARD
> #define CONFIG_KEYBOARD
> diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
> index dd3e026b148..998e353c5e5 100644
> --- a/include/configs/tec-ng.h
> +++ b/include/configs/tec-ng.h
> @@ -33,10 +33,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> /* Tag support */
> #define CONFIG_CMDLINE_TAG
> #define CONFIG_SETUP_MEMORY_TAGS
> diff --git a/include/configs/tec.h b/include/configs/tec.h
> index a40212190ab..e40bfb9ba12 100644
> --- a/include/configs/tec.h
> +++ b/include/configs/tec.h
> @@ -28,8 +28,6 @@
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/tegra-common.h b/include/configs/tegra-
> common.h
> index 4d249ddfd27..e6b180f8fbc 100644
> --- a/include/configs/tegra-common.h
> +++ b/include/configs/tegra-common.h
> @@ -39,15 +39,9 @@
> */
> #define CONFIG_SYS_MMC_MAX_DEVICE 4
>
> -/*
> - * select serial console configuration
> - */
> -
> /* allow to overwrite serial and ethaddr */
> #define CONFIG_ENV_OVERWRITE
>
> -/* turn on command-line edit/hist/auto */
> -
> /*
> * Increasing the size of the IO buffer as default nfsargs size is
> more
> * than 256 and so it is not possible to edit it
> diff --git a/include/configs/tegra210-common.h
> b/include/configs/tegra210-common.h
> index 16b962db640..1c533118ad0 100644
> --- a/include/configs/tegra210-common.h
> +++ b/include/configs/tegra210-common.h
> @@ -14,10 +14,6 @@
> */
> #define V_NS16550_CLK 408000000 /* 408MHz
> (pllp_out0) */
>
> -/*----------------------------------------------------------------
> -------
> - * Physical Memory Map
> - */
> -
> /* Generic Interrupt Controller */
> #define CONFIG_GICV2
>
> diff --git a/include/configs/tegra30-common.h
> b/include/configs/tegra30-common.h
> index 70964a90cea..2c7a1852aed 100644
> --- a/include/configs/tegra30-common.h
> +++ b/include/configs/tegra30-common.h
> @@ -18,10 +18,6 @@
> */
> #define CONFIG_STACKBASE 0x82800000 /* 40MB */
>
> -/*----------------------------------------------------------------
> -------
> - * Physical Memory Map
> - */
> -
> /*
> * Memory layout for where various images get loaded by boot
> scripts:
> *
> diff --git a/include/configs/trimslice.h
> b/include/configs/trimslice.h
> index 427da1c1c22..8972e1738a5 100644
> --- a/include/configs/trimslice.h
> +++ b/include/configs/trimslice.h
> @@ -36,12 +36,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* PCI host support */
> -
> -/* General networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/venice2.h b/include/configs/venice2.h
> index e542187efcd..8bb74aae1b1 100644
> --- a/include/configs/venice2.h
> +++ b/include/configs/venice2.h
> @@ -34,10 +34,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> -/* General networking support */
> -
> #include "tegra-common-usb-gadget.h"
> #include "tegra-common-post.h"
>
> diff --git a/include/configs/ventana.h b/include/configs/ventana.h
> index 3f9db3303fd..7391262b499 100644
> --- a/include/configs/ventana.h
> +++ b/include/configs/ventana.h
> @@ -27,8 +27,6 @@
> /* USB Host support */
> #define CONFIG_USB_EHCI_TEGRA
>
> -/* USB networking support */
> -
> #include "tegra-common-post.h"
>
> #endif /* __CONFIG_H */
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
2018-09-16 17:22 ` [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value Peter Robinson
@ 2018-09-17 10:10 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 10:10 UTC (permalink / raw)
To: u-boot
On Sun, 2018-09-16 at 18:22 +0100, Peter Robinson wrote:
> All other Tegra devices that define USB_EHCI_TXFIFO_THRESH use hex
> representation, fix tegra20 to be the same format.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> ---
> include/configs/tegra20-common.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/tegra20-common.h
> b/include/configs/tegra20-common.h
> index 7f0a5292c2e..3551616cd1e 100644
> --- a/include/configs/tegra20-common.h
> +++ b/include/configs/tegra20-common.h
> @@ -78,7 +78,7 @@
> * parameter, the default (2) causes occasional Data Buffer Errors
> in OUT
> * packets depending on the buffer address and size.
> */
> -#define CONFIG_USB_EHCI_TXFIFO_THRESH 10
> +#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
I'm not quite sure about this one but believe that 10 on tegra20 vs.
0x10 on the others may actually be intentional. At least the same value
is used in the Linux kernel:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree
/drivers/usb/host/ehci-tegra.c#n567
Maybe one of them Warrens would know where exactly that
distinction/value came from?
However, I agree that using 0xa instead of 10 would make this more
clear.
> #define CONFIG_EHCI_IS_TDI
>
> #define CONFIG_SYS_NAND_SELF_INIT
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA
2018-09-16 17:23 ` [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA Peter Robinson
@ 2018-09-17 13:51 ` Marcel Ziswiler
2018-09-17 13:54 ` Marcel Ziswiler
0 siblings, 1 reply; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 13:51 UTC (permalink / raw)
To: u-boot
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 at 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-common
-post.h;h=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hb=HEAD#l108
> ---
> 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 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 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
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA
2018-09-16 17:22 ` [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA Peter Robinson
@ 2018-09-17 13:52 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 13:52 UTC (permalink / raw)
To: u-boot
On Sun, 2018-09-16 at 18:22 +0100, Peter Robinson wrote:
> Migrate SYS_I2C_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: Heiko Schocher <hs@denx.de>
> Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Cc: Peter.Chubb at 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 good.
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-common
-post.h;h=e54428ba43e202acdd8a363874c1bbd4f4feb65b;hb=HEAD#l108
> ---
> 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/jetson-tk1_defconfig | 1 +
> configs/nyan-big_defconfig | 1 +
> configs/p2371-0000_defconfig | 1 +
> configs/p2371-2180_defconfig | 1 +
> configs/p2571_defconfig | 1 +
> configs/p2771-0000-000_defconfig | 1 +
> configs/p2771-0000-500_defconfig | 1 +
> configs/seaboard_defconfig | 1 +
> configs/tec-ng_defconfig | 1 +
> configs/trimslice_defconfig | 1 +
> configs/venice2_defconfig | 1 +
> drivers/i2c/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 | 3 ---
> include/configs/colibri_t30.h | 3 ---
> include/configs/dalmore.h | 3 ---
> include/configs/e2220-1170.h | 3 ---
> include/configs/jetson-tk1.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/p2771-0000.h | 3 ---
> include/configs/seaboard.h | 3 ---
> include/configs/tec-ng.h | 3 ---
> include/configs/trimslice.h | 3 ---
> include/configs/venice2.h | 3 ---
> scripts/config_whitelist.txt | 1 -
> 41 files changed, 26 insertions(+), 58 deletions(-)
>
> diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-
> tk1_defconfig
> index 83721b403b5..ca5ded8e946 100644
> --- a/configs/apalis-tk1_defconfig
> +++ b/configs/apalis-tk1_defconfig
> @@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/apalis_t30_defconfig
> b/configs/apalis_t30_defconfig
> index 0e6547b72c4..05b1a57ff26 100644
> --- a/configs/apalis_t30_defconfig
> +++ b/configs/apalis_t30_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
> index 28cb04c38be..d8513a0b8c8 100644
> --- a/configs/beaver_defconfig
> +++ b/configs/beaver_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
> index c046ef5d8be..545b3ee8db4 100644
> --- a/configs/cardhu_defconfig
> +++ b/configs/cardhu_defconfig
> @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-
> som_defconfig
> index c782fef89e9..5ea257e778d 100644
> --- a/configs/cei-tk1-som_defconfig
> +++ b/configs/cei-tk1-som_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/colibri_t20_defconfig
> b/configs/colibri_t20_defconfig
> index dcb2bcf617b..496f4be0238 100644
> --- a/configs/colibri_t20_defconfig
> +++ b/configs/colibri_t20_defconfig
> @@ -33,6 +33,7 @@ CONFIG_CMD_UBI=y
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
> CONFIG_ENV_IS_IN_NAND=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/colibri_t30_defconfig
> b/configs/colibri_t30_defconfig
> index c8b82a9b582..07f34359d1d 100644
> --- a/configs/colibri_t30_defconfig
> +++ b/configs/colibri_t30_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
> index 9c08aadc0d1..f07dc020786 100644
> --- a/configs/dalmore_defconfig
> +++ b/configs/dalmore_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/e2220-1170_defconfig b/configs/e2220-
> 1170_defconfig
> index 89035a051d6..b13ad39abe8 100644
> --- a/configs/e2220-1170_defconfig
> +++ b/configs/e2220-1170_defconfig
> @@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> CONFIG_DFU_SF=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_SYS_NS16550=y
> diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-
> tk1_defconfig
> index 76f3376e3ce..ba7a463d47a 100644
> --- a/configs/jetson-tk1_defconfig
> +++ b/configs/jetson-tk1_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
> index ae6d76dfb20..4a8e864b7e1 100644
> --- a/configs/nyan-big_defconfig
> +++ b/configs/nyan-big_defconfig
> @@ -41,6 +41,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_OF_LIVE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/configs/p2371-0000_defconfig b/configs/p2371-
> 0000_defconfig
> index 02a75692051..30d28f6ee5c 100644
> --- a/configs/p2371-0000_defconfig
> +++ b/configs/p2371-0000_defconfig
> @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> CONFIG_DFU_SF=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_SYS_NS16550=y
> diff --git a/configs/p2371-2180_defconfig b/configs/p2371-
> 2180_defconfig
> index d9dcf7e014e..3ad43ff5cd8 100644
> --- a/configs/p2371-2180_defconfig
> +++ b/configs/p2371-2180_defconfig
> @@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> CONFIG_DFU_SF=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_RTL8169=y
> diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
> index 5cbb1c3201a..75b7e9c5482 100644
> --- a/configs/p2571_defconfig
> +++ b/configs/p2571_defconfig
> @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> CONFIG_DFU_SF=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_SYS_NS16550=y
> diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-
> 000_defconfig
> index 2bf2e313599..ac85efa37b3 100644
> --- a/configs/p2771-0000-000_defconfig
> +++ b/configs/p2771-0000-000_defconfig
> @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_NFS is not set
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_TEGRA186_BPMP_I2C=y
> CONFIG_DWC_ETH_QOS=y
> CONFIG_E1000=y
> diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-
> 500_defconfig
> index 1e33c1f95b0..df4d914d85c 100644
> --- a/configs/p2771-0000-500_defconfig
> +++ b/configs/p2771-0000-500_defconfig
> @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_NFS is not set
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_TEGRA186_BPMP_I2C=y
> CONFIG_DWC_ETH_QOS=y
> CONFIG_E1000=y
> diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
> index 69e159b43e1..6c56c7bdedf 100644
> --- a/configs/seaboard_defconfig
> +++ b/configs/seaboard_defconfig
> @@ -22,6 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
> CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DM_PMIC=y
> CONFIG_DM_REGULATOR=y
> diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
> index 65ac1c2e5b1..dd29589c5de 100644
> --- a/configs/tec-ng_defconfig
> +++ b/configs/tec-ng_defconfig
> @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> diff --git a/configs/trimslice_defconfig
> b/configs/trimslice_defconfig
> index 6dfb3fbda80..c3bbe41ce61 100644
> --- a/configs/trimslice_defconfig
> +++ b/configs/trimslice_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_WINBOND=y
> diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
> index 12043180c00..bcbdbe345fb 100644
> --- a/configs/venice2_defconfig
> +++ b/configs/venice2_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
> +CONFIG_SYS_I2C_TEGRA=y
> CONFIG_SPL_DM=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_RAM=y
> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
> index ae3b5015551..b45d09823c6 100644
> --- a/drivers/i2c/Kconfig
> +++ b/drivers/i2c/Kconfig
> @@ -400,6 +400,12 @@ config SYS_I2C_STM32F7
> _ Optional clock stretching
> _ Software reset
>
> +config SYS_I2C_TEGRA
> + bool "NVIDIA Tegra internal I2C controller"
> + depends on TEGRA
> + help
> + Support for NVIDIA I2C controller available in Tegra SoCs.
> +
> config SYS_I2C_UNIPHIER
> bool "UniPhier I2C driver"
> depends on ARCH_UNIPHIER && DM_I2C
> diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-
> tk1.h
> index 506a9e4f2fe..05c958a8fea 100644
> --- a/include/configs/apalis-tk1.h
> +++ b/include/configs/apalis-tk1.h
> @@ -18,9 +18,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* SD/MMC support */
> #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
>
> diff --git a/include/configs/apalis_t30.h
> b/include/configs/apalis_t30.h
> index ac012225a77..254a3c4aa8c 100644
> --- a/include/configs/apalis_t30.h
> +++ b/include/configs/apalis_t30.h
> @@ -18,9 +18,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, before config block at the end of 1st "boot
> sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
> CONFIG_TDX_CFG_BLOCK_OFFSET
> )
> diff --git a/include/configs/beaver.h b/include/configs/beaver.h
> index 8ea583ddfc4..6d17750f400 100644
> --- a/include/configs/beaver.h
> +++ b/include/configs/beaver.h
> @@ -22,9 +22,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_BEAVER
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
> index 2ad93204443..65c7d2c39b2 100644
> --- a/include/configs/cardhu.h
> +++ b/include/configs/cardhu.h
> @@ -26,9 +26,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_CARDHU
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-
> som.h
> index b595c482632..7ba17a6fd63 100644
> --- a/include/configs/cei-tk1-som.h
> +++ b/include/configs/cei-tk1-som.h
> @@ -22,9 +22,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTD
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/colibri_t20.h
> b/include/configs/colibri_t20.h
> index c34d6d055c3..26d8e8eb0ed 100644
> --- a/include/configs/colibri_t20.h
> +++ b/include/configs/colibri_t20.h
> @@ -17,9 +17,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* USB host support */
> #define CONFIG_USB_EHCI_TEGRA
> #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
> diff --git a/include/configs/colibri_t30.h
> b/include/configs/colibri_t30.h
> index 6b1a831da9a..c933705de7e 100644
> --- a/include/configs/colibri_t30.h
> +++ b/include/configs/colibri_t30.h
> @@ -20,9 +20,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, before config block at the end of 1st "boot
> sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
> CONFIG_TDX_CFG_BLOCK_OFFSET
> )
> diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
> index afd2dd2f64c..1ae523409cc 100644
> --- a/include/configs/dalmore.h
> +++ b/include/configs/dalmore.h
> @@ -19,9 +19,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_DALMORE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-
> 1170.h
> index 6fe2f667957..1e917345d81 100644
> --- a/include/configs/e2220-1170.h
> +++ b/include/configs/e2220-1170.h
> @@ -17,9 +17,6 @@
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-
> tk1.h
> index 192d821d4b2..f93c81a6d42 100644
> --- a/include/configs/jetson-tk1.h
> +++ b/include/configs/jetson-tk1.h
> @@ -18,9 +18,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTD
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
> index 4a0de707335..bb982011906 100644
> --- a/include/configs/nyan-big.h
> +++ b/include/configs/nyan-big.h
> @@ -18,9 +18,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-
> 0000.h
> index 9e22bbb8cf4..5843cc00eb1 100644
> --- a/include/configs/p2371-0000.h
> +++ b/include/configs/p2371-0000.h
> @@ -17,9 +17,6 @@
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-
> 2180.h
> index 76c11ad7a0c..3486cc8117e 100644
> --- a/include/configs/p2371-2180.h
> +++ b/include/configs/p2371-2180.h
> @@ -17,9 +17,6 @@
> /* Board-specific serial config */
> #define CONFIG_TEGRA_ENABLE_UARTA
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/p2571.h b/include/configs/p2571.h
> index 5e34f22618f..a64b6c42a5d 100644
> --- a/include/configs/p2571.h
> +++ b/include/configs/p2571.h
> @@ -18,9 +18,6 @@
> #define CONFIG_SERIAL_MULTI
> #define CONFIG_TEGRA_ENABLE_UARTA
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-
> 0000.h
> index e8be81a66cf..e546c1d73fd 100644
> --- a/include/configs/p2771-0000.h
> +++ b/include/configs/p2771-0000.h
> @@ -13,9 +13,6 @@
> /* High-level configuration options */
> #define CONFIG_TEGRA_BOARD_STRING "NVIDIA P2771-0000"
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index ef3848d6df0..53d9546dc6e 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -26,9 +26,6 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
> index 998e353c5e5..205c90ff2fa 100644
> --- a/include/configs/tec-ng.h
> +++ b/include/configs/tec-ng.h
> @@ -16,9 +16,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTD
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
> #define CONFIG_SYS_MMC_ENV_DEV 0
> diff --git a/include/configs/trimslice.h
> b/include/configs/trimslice.h
> index 8972e1738a5..4e2b57c1a43 100644
> --- a/include/configs/trimslice.h
> +++ b/include/configs/trimslice.h
> @@ -23,9 +23,6 @@
> /* SPI */
> #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in SPI */
> #define CONFIG_ENV_SPI_MAX_HZ 48000000
> #define CONFIG_ENV_SPI_MODE SPI_MODE_0
> diff --git a/include/configs/venice2.h b/include/configs/venice2.h
> index 8bb74aae1b1..72e6d8a5db0 100644
> --- a/include/configs/venice2.h
> +++ b/include/configs/venice2.h
> @@ -18,9 +18,6 @@
> #define CONFIG_TEGRA_ENABLE_UARTA
> #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_TEGRA
> -
> /* Environment in eMMC, at the end of 2nd "boot sector" */
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt
> index fc37099cbe0..dbf4abc2f1b 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -3179,7 +3179,6 @@ CONFIG_SYS_I2C_SPEED2
> CONFIG_SYS_I2C_SPEED3
> CONFIG_SYS_I2C_TCA642X_ADDR
> CONFIG_SYS_I2C_TCA642X_BUS_NUM
> -CONFIG_SYS_I2C_TEGRA
> CONFIG_SYS_I2C_W83782G_ADDR
> CONFIG_SYS_IBAT
> CONFIG_SYS_IBAT0L
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA
2018-09-17 13:51 ` Marcel Ziswiler
@ 2018-09-17 13:54 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 13:54 UTC (permalink / raw)
To: u-boot
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 at 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 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 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
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD
2018-09-16 17:23 ` [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD Peter Robinson
@ 2018-09-17 13:59 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 13:59 UTC (permalink / raw)
To: u-boot
On Sun, 2018-09-16 at 18:23 +0100, Peter Robinson wrote:
> Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard
> uses it but we
> drop CONFIG_KEYBOARD as the driver doesn't use the legacy
> drv_keyboard_init.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> configs/seaboard_defconfig | 1 +
> drivers/input/Kconfig | 6 ++++++
> include/configs/seaboard.h | 4 ----
> scripts/config_whitelist.txt | 1 -
> 4 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
> index 917ddcce3f3..f9638e6016d 100644
> --- a/configs/seaboard_defconfig
> +++ b/configs/seaboard_defconfig
> @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_I2C_TEGRA=y
> +CONFIG_TEGRA_KEYBOARD=y
> CONFIG_SPL_DM=y
> CONFIG_DM_PMIC=y
> CONFIG_DM_REGULATOR=y
> diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
> index 7ffb949f12d..a1353848c22 100644
> --- a/drivers/input/Kconfig
> +++ b/drivers/input/Kconfig
> @@ -25,6 +25,12 @@ config I8042_KEYB
> variable 'keymap' to "de" to select German. Keyboard
> repeat is
> handled by the keyboard itself.
>
> +config TEGRA_KEYBOARD
> + bool "NVIDIA Tegra internal matrix keyboard controller
> support"
> + help
> + A matrix keyboard connected directly to the internal
> keyboard
> + controller on Tegra SoCs.
> +
> config TWL4030_INPUT
> bool "Enable TWL4030 Input controller"
> help
> diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
> index c5fa9cc4208..5df013b0b32 100644
> --- a/include/configs/seaboard.h
> +++ b/include/configs/seaboard.h
> @@ -31,10 +31,6 @@
> #define CONFIG_SYS_MMC_ENV_DEV 0
> #define CONFIG_SYS_MMC_ENV_PART 2
>
> -/* Enable keyboard */
> -#define CONFIG_TEGRA_KEYBOARD
> -#define CONFIG_KEYBOARD
> -
> /* NAND support */
> #define CONFIG_TEGRA_NAND
>
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt
> index 5813e884e2f..3dc14a2dd92 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -4436,7 +4436,6 @@ CONFIG_TEGRA_ENABLE_UARTC
> CONFIG_TEGRA_ENABLE_UARTD
> CONFIG_TEGRA_ENABLE_UARTE
> CONFIG_TEGRA_GPU
> -CONFIG_TEGRA_KEYBOARD
> CONFIG_TEGRA_LP0
> CONFIG_TEGRA_NAND
> CONFIG_TEGRA_PMU
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD
2018-09-16 17:23 ` [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD Peter Robinson
@ 2018-09-17 14:04 ` Marcel Ziswiler
0 siblings, 0 replies; 18+ messages in thread
From: Marcel Ziswiler @ 2018-09-17 14:04 UTC (permalink / raw)
To: u-boot
On Sun, 2018-09-16 at 18:23 +0100, Peter Robinson wrote:
> The CONFIG_KEYBOARD does nothing as it's legacy and unused
> so just drop it from the config.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Allen Martin <amartin@nvidia.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> include/configs/nyan-big.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
> index 3d43839e413..933f84028f4 100644
> --- a/include/configs/nyan-big.h
> +++ b/include/configs/nyan-big.h
> @@ -31,8 +31,6 @@
> #define CONFIG_SF_DEFAULT_SPEED 24000000
> #define CONFIG_SPI_FLASH_SIZE (4 << 20)
>
> -#define CONFIG_KEYBOARD
> -
> #undef CONFIG_LOADADDR
> #define CONFIG_LOADADDR 0x82408000
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] Some tegra cleanups and Kconfig migrations
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
` (5 preceding siblings ...)
2018-09-16 17:23 ` [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD Peter Robinson
@ 2018-11-07 14:12 ` Peter Robinson
2018-11-07 15:17 ` Tom Warren
6 siblings, 1 reply; 18+ messages in thread
From: Peter Robinson @ 2018-11-07 14:12 UTC (permalink / raw)
To: u-boot
Tom or Tom,
Any chance we could get these reviewed and merged, mostly generic
cleanups so I don't think most of them are controversial.
Peter
On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> The following patches are a few cleanups to dangling comments from Kconfig
> cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD.
> There's also a couple of other minors fixes and cleanups as well.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] Some tegra cleanups and Kconfig migrations
2018-11-07 14:12 ` [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
@ 2018-11-07 15:17 ` Tom Warren
2018-11-07 15:31 ` Tom Warren
0 siblings, 1 reply; 18+ messages in thread
From: Tom Warren @ 2018-11-07 15:17 UTC (permalink / raw)
To: u-boot
Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW.
-----Original Message-----
From: Peter Robinson <pbrobinson@gmail.com>
Sent: Wednesday, November 7, 2018 7:12 AM
To: u-boot at lists.denx.de; Tom Warren <TWarren@nvidia.com>; Tom Rini <trini@konsulko.com>
Subject: Re: Some tegra cleanups and Kconfig migrations
Tom or Tom,
Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial.
Peter
On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> The following patches are a few cleanups to dangling comments from
> Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD.
> There's also a couple of other minors fixes and cleanups as well.
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information. Any unauthorized review, use, disclosure or distribution
is prohibited. If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] Some tegra cleanups and Kconfig migrations
2018-11-07 15:17 ` Tom Warren
@ 2018-11-07 15:31 ` Tom Warren
2018-12-04 5:30 ` Peter Robinson
0 siblings, 1 reply; 18+ messages in thread
From: Tom Warren @ 2018-11-07 15:31 UTC (permalink / raw)
To: u-boot
Peter,
The SYS_I2C patch doesn't apply cleanly to TOT u-boot-tegra/master (see below git am spew). Please take a look & let me know when you've resent a fixed patchset and I'll retry.
Tom
tom at tom-lt2:~/denx/uboot-tegra$ git am -s --whitespace=strip ~/Downloads/bundle-17667-Peter-cleanup-6.mbox
Applying: tegra: cleanup dangling comments in include/configs
Applying: tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
Applying: Kconfig: tegra: Migrate SYS_I2C_TEGRA
error: patch failed: configs/apalis-tk1_defconfig:29
error: configs/apalis-tk1_defconfig: patch does not apply
error: patch failed: configs/apalis_t30_defconfig:26
error: configs/apalis_t30_defconfig: patch does not apply
error: patch failed: configs/beaver_defconfig:26
error: configs/beaver_defconfig: patch does not apply
error: patch failed: configs/cardhu_defconfig:23
error: configs/cardhu_defconfig: patch does not apply
error: patch failed: configs/cei-tk1-som_defconfig:25
error: configs/cei-tk1-som_defconfig: patch does not apply
error: patch failed: configs/colibri_t20_defconfig:33
error: configs/colibri_t20_defconfig: patch does not apply
error: patch failed: configs/colibri_t30_defconfig:25
error: configs/colibri_t30_defconfig: patch does not apply
error: patch failed: configs/dalmore_defconfig:25
error: configs/dalmore_defconfig: patch does not apply
error: patch failed: configs/jetson-tk1_defconfig:26
error: configs/jetson-tk1_defconfig: patch does not apply
error: patch failed: configs/nyan-big_defconfig:41
error: configs/nyan-big_defconfig: patch does not apply
error: patch failed: configs/p2771-0000-000_defconfig:20
error: configs/p2771-0000-000_defconfig: patch does not apply
error: patch failed: configs/p2771-0000-500_defconfig:20
error: configs/p2771-0000-500_defconfig: patch does not apply
error: patch failed: configs/seaboard_defconfig:22
error: configs/seaboard_defconfig: patch does not apply
error: patch failed: configs/tec-ng_defconfig:23
error: configs/tec-ng_defconfig: patch does not apply
error: patch failed: configs/trimslice_defconfig:24
error: configs/trimslice_defconfig: patch does not apply
error: patch failed: configs/venice2_defconfig:24
error: configs/venice2_defconfig: patch does not apply
Patch failed at 0003 Kconfig: tegra: Migrate SYS_I2C_TEGRA
The copy of the patch that failed is found in:
/home/tom/denx/uboot-tegra/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
-----Original Message-----
From: Tom Warren
Sent: Wednesday, November 7, 2018 8:17 AM
To: Peter Robinson <pbrobinson@gmail.com>; u-boot at lists.denx.de; Tom Rini <trini@konsulko.com>
Subject: RE: Some tegra cleanups and Kconfig migrations
Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW.
-----Original Message-----
From: Peter Robinson <pbrobinson@gmail.com>
Sent: Wednesday, November 7, 2018 7:12 AM
To: u-boot at lists.denx.de; Tom Warren <TWarren@nvidia.com>; Tom Rini <trini@konsulko.com>
Subject: Re: Some tegra cleanups and Kconfig migrations
Tom or Tom,
Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial.
Peter
On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> The following patches are a few cleanups to dangling comments from
> Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD.
> There's also a couple of other minors fixes and cleanups as well.
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information. Any unauthorized review, use, disclosure or distribution
is prohibited. If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 18+ messages in thread
* [U-Boot] Some tegra cleanups and Kconfig migrations
2018-11-07 15:31 ` Tom Warren
@ 2018-12-04 5:30 ` Peter Robinson
0 siblings, 0 replies; 18+ messages in thread
From: Peter Robinson @ 2018-12-04 5:30 UTC (permalink / raw)
To: u-boot
Tom,
> The SYS_I2C patch doesn't apply cleanly to TOT u-boot-tegra/master (see below git am spew). Please take a look & let me know when you've resent a fixed patchset and I'll retry.
I'm not sure where u-boot-tegra/master is but I just applied the
patches to 2019.01-rc1 upstream and they all applied fine with git am
so I'm not sure the difference between your branch and upstream.
Peter
> tom at tom-lt2:~/denx/uboot-tegra$ git am -s --whitespace=strip ~/Downloads/bundle-17667-Peter-cleanup-6.mbox
> Applying: tegra: cleanup dangling comments in include/configs
> Applying: tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
> Applying: Kconfig: tegra: Migrate SYS_I2C_TEGRA
> error: patch failed: configs/apalis-tk1_defconfig:29
> error: configs/apalis-tk1_defconfig: patch does not apply
> error: patch failed: configs/apalis_t30_defconfig:26
> error: configs/apalis_t30_defconfig: patch does not apply
> error: patch failed: configs/beaver_defconfig:26
> error: configs/beaver_defconfig: patch does not apply
> error: patch failed: configs/cardhu_defconfig:23
> error: configs/cardhu_defconfig: patch does not apply
> error: patch failed: configs/cei-tk1-som_defconfig:25
> error: configs/cei-tk1-som_defconfig: patch does not apply
> error: patch failed: configs/colibri_t20_defconfig:33
> error: configs/colibri_t20_defconfig: patch does not apply
> error: patch failed: configs/colibri_t30_defconfig:25
> error: configs/colibri_t30_defconfig: patch does not apply
> error: patch failed: configs/dalmore_defconfig:25
> error: configs/dalmore_defconfig: patch does not apply
> error: patch failed: configs/jetson-tk1_defconfig:26
> error: configs/jetson-tk1_defconfig: patch does not apply
> error: patch failed: configs/nyan-big_defconfig:41
> error: configs/nyan-big_defconfig: patch does not apply
> error: patch failed: configs/p2771-0000-000_defconfig:20
> error: configs/p2771-0000-000_defconfig: patch does not apply
> error: patch failed: configs/p2771-0000-500_defconfig:20
> error: configs/p2771-0000-500_defconfig: patch does not apply
> error: patch failed: configs/seaboard_defconfig:22
> error: configs/seaboard_defconfig: patch does not apply
> error: patch failed: configs/tec-ng_defconfig:23
> error: configs/tec-ng_defconfig: patch does not apply
> error: patch failed: configs/trimslice_defconfig:24
> error: configs/trimslice_defconfig: patch does not apply
> error: patch failed: configs/venice2_defconfig:24
> error: configs/venice2_defconfig: patch does not apply
> Patch failed at 0003 Kconfig: tegra: Migrate SYS_I2C_TEGRA
> The copy of the patch that failed is found in:
> /home/tom/denx/uboot-tegra/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --resolved".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> -----Original Message-----
> From: Tom Warren
> Sent: Wednesday, November 7, 2018 8:17 AM
> To: Peter Robinson <pbrobinson@gmail.com>; u-boot at lists.denx.de; Tom Rini <trini@konsulko.com>
> Subject: RE: Some tegra cleanups and Kconfig migrations
>
> Sorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW.
>
> -----Original Message-----
> From: Peter Robinson <pbrobinson@gmail.com>
> Sent: Wednesday, November 7, 2018 7:12 AM
> To: u-boot at lists.denx.de; Tom Warren <TWarren@nvidia.com>; Tom Rini <trini@konsulko.com>
> Subject: Re: Some tegra cleanups and Kconfig migrations
>
> Tom or Tom,
>
> Any chance we could get these reviewed and merged, mostly generic cleanups so I don't think most of them are controversial.
>
> Peter
>
> On Sun, Sep 16, 2018 at 6:23 PM Peter Robinson <pbrobinson@gmail.com> wrote:
> >
> > The following patches are a few cleanups to dangling comments from
> > Kconfig cleanups and migrations of SYS_I2C_TEGRA, USB_EHCI_TEGRA and TEGRA_KEYBOARD.
> > There's also a couple of other minors fixes and cleanups as well.
>
> -----------------------------------------------------------------------------------
> This email message is for the sole use of the intended recipient(s) and may contain
> confidential information. Any unauthorized review, use, disclosure or distribution
> is prohibited. If you are not the intended recipient, please contact the sender by
> reply email and destroy all copies of the original message.
> -----------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2018-12-04 5:30 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-16 17:22 [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
2018-09-16 17:22 ` [U-Boot] [PATCH 1/6] tegra: cleanup dangling comments in include/configs Peter Robinson
2018-09-17 10:00 ` Marcel Ziswiler
2018-09-16 17:22 ` [U-Boot] [PATCH 2/6] tegra20: common: fix USB_EHCI_TXFIFO_THRESH value Peter Robinson
2018-09-17 10:10 ` Marcel Ziswiler
2018-09-16 17:22 ` [U-Boot] [PATCH 3/6] Kconfig: tegra: Migrate SYS_I2C_TEGRA Peter Robinson
2018-09-17 13:52 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 4/6] Kconfig: tegra: Migrate USB_EHCI_TEGRA Peter Robinson
2018-09-17 13:51 ` Marcel Ziswiler
2018-09-17 13:54 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 5/6] Kconfig: tegra: Migrate TEGRA_KEYBOARD Peter Robinson
2018-09-17 13:59 ` Marcel Ziswiler
2018-09-16 17:23 ` [U-Boot] [PATCH 6/6] nyan-big: drop CONFIG_KEYBOARD Peter Robinson
2018-09-17 14:04 ` Marcel Ziswiler
2018-11-07 14:12 ` [U-Boot] Some tegra cleanups and Kconfig migrations Peter Robinson
2018-11-07 15:17 ` Tom Warren
2018-11-07 15:31 ` Tom Warren
2018-12-04 5:30 ` Peter Robinson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.