Some tegra cleanups and Kconfig migrations
Subsystems (4)
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.
PATCH 1/6 tegra: cleanup dangling comments in include/configs
There's a number of dangling comments in various tegra configs post migrations of various configs so lets clean them up.
--- 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(-)
include/configs/apalis-tk1.h +0 -2
@@ -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
include/configs/apalis_t30.h +0 -4
@@ -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
include/configs/beaver.h +0 -6
@@ -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"
include/configs/cardhu.h +0 -6
@@ -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 */
include/configs/cei-tk1-som.h +0 -6
@@ -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"
include/configs/colibri_t20.h +0 -6
@@ -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 */
include/configs/colibri_t30.h +0 -2
@@ -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
include/configs/dalmore.h +0 -4
@@ -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"
include/configs/e2220-1170.h +0 -4
@@ -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"
include/configs/harmony.h +0 -4
@@ -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 */
include/configs/jetson-tk1.h +0 -6
@@ -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"
include/configs/medcom-wide.h +0 -2
@@ -28,8 +28,6 @@/* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/nyan-big.h +0 -4
@@ -37,10 +37,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ -#define CONFIG_KEYBOARD #undef CONFIG_LOADADDR
include/configs/p2371-0000.h +0 -4
@@ -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"
include/configs/p2371-2180.h +0 -6
@@ -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"
include/configs/p2571.h +0 -4
@@ -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"
include/configs/p2771-0000.h +0 -2
@@ -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" \
include/configs/paz00.h +0 -2
@@ -29,8 +29,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/plutux.h +0 -4
@@ -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 */
include/configs/seaboard.h +0 -2
@@ -37,8 +37,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -/* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD
include/configs/tec-ng.h +0 -4
@@ -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
include/configs/tec.h +0 -2
@@ -28,8 +28,6 @@/* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/tegra-common.h +0 -6
@@ -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
include/configs/tegra210-common.h +0 -4
@@ -14,10 +14,6 @@*/ #define V_NS16550_CLK 408000000/* 408MHz (pllp_out0) */ -/*----------------------------------------------------------------------- -* Physical Memory Map -*/ -/* Generic Interrupt Controller */ #define CONFIG_GICV2
include/configs/tegra30-common.h +0 -4
@@ -18,10 +18,6 @@*/ #define CONFIG_STACKBASE 0x82800000/* 40MB */ -/*----------------------------------------------------------------------- -* Physical Memory Map -*/ -/* * Memory layout for where various images get loaded by boot scripts: *
include/configs/trimslice.h +0 -6
@@ -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 */
include/configs/venice2.h +0 -4
@@ -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"
include/configs/ventana.h +0 -2
@@ -27,8 +27,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */
Signature · 1 line
2.19.0
PATCH 1/6 tegra: cleanup dangling comments in include/configs
Quoted 4 lines · Peter Robinson
There's a number of dangling comments in various tegra configs post migrations
of various configs so lets clean them up.
Quoted 11 lines
Signed-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Marcel Ziswiler <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Peter.Chubb at data61.csiro.auCc Lucas Stach <[email protected]>Cc Stefan Agner <[email protected]>Cc Alban Bedel <[email protected]>Cc Allen Martin <[email protected]>
Makes perfect sense.
Quoted 506 lines
--- 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(-)include/configs/apalis- renamed from include/configs/apalis-tk1.h +0
-0
tk1.h
index667d0846118..506a9e4f2fe100644include/configs/apalis-tk1.h +0
-2@@ -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_BASEinclude/configs/apalis_t30.h +0
-4@@ -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 include/configs/beaver.h +0
-6@@ -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" include/configs/cardhu.h +0
-6@@ -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 */ include/configs/cei-tk1- renamed from include/configs/cei-tk1-som.h +0
-0
som.h
index14008440dae..b595c482632100644include/configs/cei-tk1-som.h +0
-6@@ -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" include/configs/colibri_t20.h +0
-6@@ -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 */
#defineCONFIG_ENV_OFFSET(SZ_2M)
#undefCONFIG_ENV_SIZE/* undef size from tegra20-common.h*/include/configs/colibri_t30.h +0
-2@@ -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 16352include/configs/dalmore.h +0
-4@@ -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" include/configs/e2220- renamed from include/configs/e2220-1170.h +0
-01170.h
indexdd7a01290ae..6fe2f667957100644include/configs/e2220-1170.h +0
-4@@ -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" include/configs/harmony.h +0
-2@@ -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 */
#defineCONFIG_ENV_OFFSET(SZ_512M-SZ_128K) /* 128K sector
size *//* USB Host support */
#defineCONFIG_USB_EHCI_TEGRAinclude/configs/harmony.h +0
-2-/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/jetson- renamed from include/configs/jetson-tk1.h +0
-0
tk1.h
index93fcdd6bcc5..192d821d4b2100644include/configs/jetson-tk1.h +0
-6@@ -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" include/configs/medcom- renamed from include/configs/medcom-wide.h +0
-0
wide.h
indexb290df58915..88976fed64c100644include/configs/medcom-wide.h +0
-2@@ -28,8 +28,6 @@/* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/nyan-big.h +0
-4@@ -37,10 +37,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ - -/* General networking support */ -#define CONFIG_KEYBOARD #undef CONFIG_LOADADDRinclude/configs/p2371- renamed from include/configs/p2371-0000.h +0
-00000.h
index6654a1b4df8..9e22bbb8cf4100644include/configs/p2371-0000.h +0
-4@@ -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" include/configs/p2371- renamed from include/configs/p2371-2180.h +0
-02180.h
index0e37511daf4..76c11ad7a0c100644include/configs/p2371-2180.h +0
-6@@ -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" include/configs/p2571.h +0
-4@@ -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" include/configs/p2771- renamed from include/configs/p2771-0000.h +0
-00000.h
indexcfe8d8cbede..e8be81a66cf100644include/configs/p2771-0000.h +0
-2@@ -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" \ include/configs/p2771-0000.h +0
-0"ramdisk_addr_r\0" \include/configs/paz00.h +0
-2@@ -29,8 +29,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/plutux.h +0
-4@@ -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 */ include/configs/seaboard.h +0
-2@@ -37,8 +37,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -/* Enable keyboard */ #define CONFIG_TEGRA_KEYBOARD #define CONFIG_KEYBOARD include/configs/tec-ng.h +0
-4@@ -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 include/configs/tec.h +0
-2@@ -28,8 +28,6 @@/* USB host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/tegra- renamed from include/configs/tegra-common.h +0
-0
common.h
index4d249ddfd27..e6b180f8fbc100644include/configs/tegra-common.h +0
-6@@ -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 itinclude/configs/tegra210-common.h +0
-0@@ -14,10 +14,6 @@*/ #define V_NS16550_CLK 408000000/* 408MHz (
pllp_out0) */include/configs/tegra210-common.h +0
-5-/*---------------------------------------------------------------- ------- -* Physical Memory Map -*/ -/* Generic Interrupt Controller */ #define CONFIG_GICV2 include/configs/tegra30-common.h +0
-5@@ -18,10 +18,6 @@*/ #define CONFIG_STACKBASE 0x82800000/* 40MB */ -/*---------------------------------------------------------------- ------- -* Physical Memory Map -*/ -/* * Memory layout for where various images get loaded by boot scripts:
*include/configs/trimslice.h +0
-6@@ -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 */ include/configs/venice2.h +0
-4@@ -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" include/configs/ventana.h +0
-2@@ -27,8 +27,6 @@/* USB Host support */ #define CONFIG_USB_EHCI_TEGRA -/* USB networking support */ -#include "tegra-common-post.h" #endif /* __CONFIG_H */
PATCH 2/6 tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
In reply to Peter RobinsonAll other Tegra devices that define USB_EHCI_TXFIFO_THRESH use hex representation, fix tegra20 to be the same format.
--- include/configs/tegra20-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/tegra20-common.h +1 -1
@@ -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
Signature · 1 line
2.19.0
PATCH 2/6 tegra20: common: fix USB_EHCI_TXFIFO_THRESH value
Quoted 20 lines · Peter Robinson
All other Tegra devices that define
USB_EHCI_TXFIFO_THRESHuse hex representation, fix tegra20 to be the same format.Signed-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>--- include/configs/tegra20-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/configs/tegra20-common.h +0
-0@@ -78,7 +78,7 @@* parameter, the default (2) causes occasional Data Buffer Errors in OUT
* packets depending on the buffer address and size. */
include/configs/tegra20-common.h line 81
Quoted 2 lines
include/configs/tegra20-common.h +1
-1-#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.
Quoted 3 lines
#define
CONFIG_EHCI_IS_TDI#define
CONFIG_SYS_NAND_SELF_INIT
PATCH 3/6 Kconfig: tegra: Migrate SYS_I2C_TEGRA
In reply to Peter RobinsonMigrate SYS_I2C_TEGRA from headers to Kconfig
--- 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(-)
configs/apalis-tk1_defconfig +1 -0
@@ -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
configs/apalis_t30_defconfig +1 -0
@@ -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
configs/beaver_defconfig +1 -0
@@ -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
configs/cardhu_defconfig +1 -0
@@ -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
configs/cei-tk1-som_defconfig +1 -0
@@ -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
configs/colibri_t20_defconfig +1 -0
@@ -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
configs/colibri_t30_defconfig +1 -0
@@ -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
configs/dalmore_defconfig +1 -0
@@ -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
configs/e2220-1170_defconfig +1 -0
@@ -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
configs/jetson-tk1_defconfig +1 -0
@@ -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
configs/nyan-big_defconfig +1 -0
@@ -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
configs/p2371-0000_defconfig +1 -0
@@ -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
configs/p2371-2180_defconfig +1 -0
@@ -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
configs/p2571_defconfig +1 -0
@@ -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
configs/p2771-0000-000_defconfig +1 -0
@@ -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
configs/p2771-0000-500_defconfig +1 -0
@@ -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
configs/seaboard_defconfig +1 -0
@@ -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
configs/tec-ng_defconfig +1 -0
@@ -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
configs/trimslice_defconfig +1 -0
@@ -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
configs/venice2_defconfig +1 -0
@@ -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
drivers/i2c/Kconfig +6 -0
@@ -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
include/configs/apalis-tk1.h +0 -3
@@ -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 */
include/configs/apalis_t30.h +0 -3
@@ -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)
include/configs/beaver.h +0 -3
@@ -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
include/configs/cardhu.h +0 -3
@@ -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
include/configs/cei-tk1-som.h +0 -3
@@ -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
include/configs/colibri_t20.h +0 -3
@@ -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
include/configs/colibri_t30.h +0 -3
@@ -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)
include/configs/dalmore.h +0 -3
@@ -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
include/configs/e2220-1170.h +0 -3
@@ -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
include/configs/jetson-tk1.h +0 -3
@@ -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
include/configs/nyan-big.h +0 -3
@@ -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
include/configs/p2371-0000.h +0 -3
@@ -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
include/configs/p2371-2180.h +0 -3
@@ -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
include/configs/p2571.h +0 -3
@@ -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
include/configs/p2771-0000.h +0 -3
@@ -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
include/configs/seaboard.h +0 -3
@@ -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
include/configs/tec-ng.h +0 -3
@@ -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
include/configs/trimslice.h +0 -3
@@ -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
include/configs/venice2.h +0 -3
@@ -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
scripts/config_whitelist.txt +0 -1
@@ -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
Signature · 1 line
2.19.0
PATCH 3/6 Kconfig: tegra: Migrate SYS_I2C_TEGRA
Quoted 12 lines · Peter Robinson
Migrate
SYS_I2C_TEGRAfrom headers toKconfigSigned-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Heiko Schocher <[email protected]>Cc Marcel Ziswiler <[email protected]>Cc Peter.Chubb at data61.csiro.auCc Lucas Stach <[email protected]>Cc Stefan Agner <[email protected]>Cc Alban Bedel <[email protected]>Cc Allen Martin <[email protected]>
Looks good.
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
Quoted 607 lines
--- 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(-)configs/apalis- renamed from configs/apalis-tk1_defconfig +0
-0
tk1_defconfig
index83721b403b5..ca5ded8e946100644configs/apalis-tk1_defconfig +1
-0@@ -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=yconfigs/apalis_t30_defconfig +1
-0@@ -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=yconfigs/beaver_defconfig +1
-0@@ -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=yconfigs/cardhu_defconfig +1
-0@@ -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=yconfigs/cei-tk1- renamed from configs/cei-tk1-som_defconfig +0
-0
som_defconfig
indexc782fef89e9..5ea257e778d100644configs/cei-tk1-som_defconfig +1
-0@@ -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=yconfigs/colibri_t20_defconfig +1
-0@@ -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=yconfigs/colibri_t30_defconfig +1
-0@@ -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=yconfigs/dalmore_defconfig +1
-0@@ -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=yconfigs/e2220- renamed from configs/e2220-1170_defconfig +0
-01170_defconfig
index89035a051d6..b13ad39abe8100644configs/e2220-1170_defconfig +1
-0@@ -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=yconfigs/jetson- renamed from configs/jetson-tk1_defconfig +0
-0
tk1_defconfig
index76f3376e3ce..ba7a463d47a100644configs/jetson-tk1_defconfig +1
-0@@ -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=yconfigs/nyan-big_defconfig +1
-0@@ -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=yconfigs/p2371- renamed from configs/p2371-0000_defconfig +0
-00000_defconfig
index02a75692051..30d28f6ee5c100644configs/p2371-0000_defconfig +1
-0@@ -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=yconfigs/p2371- renamed from configs/p2371-2180_defconfig +0
-02180_defconfig
indexd9dcf7e014e..3ad43ff5cd8100644configs/p2371-2180_defconfig +1
-0@@ -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=yconfigs/p2571_defconfig +1
-0@@ -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=yconfigs/p2771-0000- renamed from configs/p2771-0000-000_defconfig +0
-0000_defconfig
index2bf2e313599..ac85efa37b3100644configs/p2771-0000-000_defconfig +1
-0@@ -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=yconfigs/p2771-0000- renamed from configs/p2771-0000-500_defconfig +0
-0500_defconfig
index1e33c1f95b0..df4d914d85c100644configs/p2771-0000-500_defconfig +1
-0@@ -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=yconfigs/seaboard_defconfig +1
-0@@ -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=yconfigs/tec-ng_defconfig +1
-0@@ -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=yconfigs/trimslice_defconfig +1
-0@@ -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=yconfigs/venice2_defconfig +1
-0@@ -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=ydrivers/i2c/Kconfig +6
-0@@ -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_I2Cinclude/configs/apalis- renamed from include/configs/apalis-tk1.h +0
-0
tk1.h
index506a9e4f2fe..05c958a8fea100644include/configs/apalis-tk1.h +0
-3@@ -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 */ include/configs/apalis_t30.h +0
-3@@ -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" */
#defineCONFIG_ENV_OFFSET(-CONFIG_ENV_SIZE + \
CONFIG_TDX_CFG_BLOCK_OFFSET
)include/configs/beaver.h +0
-3@@ -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 0include/configs/cardhu.h +0
-3@@ -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 0include/configs/cei-tk1- renamed from include/configs/cei-tk1-som.h +0
-0
som.h
indexb595c482632..7ba17a6fd63100644include/configs/cei-tk1-som.h +0
-3@@ -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 0include/configs/colibri_t20.h +0
-3@@ -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 3include/configs/colibri_t30.h +0
-3@@ -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" */
#defineCONFIG_ENV_OFFSET(-CONFIG_ENV_SIZE + \
CONFIG_TDX_CFG_BLOCK_OFFSET
)include/configs/dalmore.h +0
-3@@ -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 2include/configs/e2220- renamed from include/configs/e2220-1170.h +0
-01170.h
index6fe2f667957..1e917345d81100644include/configs/e2220-1170.h +0
-3@@ -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 2include/configs/jetson- renamed from include/configs/jetson-tk1.h +0
-0
tk1.h
index192d821d4b2..f93c81a6d42100644include/configs/jetson-tk1.h +0
-3@@ -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 0include/configs/nyan-big.h +0
-3@@ -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 2include/configs/p2371- renamed from include/configs/p2371-0000.h +0
-00000.h
index9e22bbb8cf4..5843cc00eb1100644include/configs/p2371-0000.h +0
-3@@ -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 2include/configs/p2371- renamed from include/configs/p2371-2180.h +0
-02180.h
index76c11ad7a0c..3486cc8117e100644include/configs/p2371-2180.h +0
-3@@ -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 2include/configs/p2571.h +0
-3@@ -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 2include/configs/p2771- renamed from include/configs/p2771-0000.h +0
-00000.h
indexe8be81a66cf..e546c1d73fd100644include/configs/p2771-0000.h +0
-3@@ -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 2include/configs/seaboard.h +0
-3@@ -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 0include/configs/tec-ng.h +0
-3@@ -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 0include/configs/trimslice.h +0
-3@@ -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_0include/configs/venice2.h +0
-3@@ -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 2scripts/config_whitelist.txt +0
-1@@ -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
PATCH 4/6 Kconfig: tegra: Migrate USB_EHCI_TEGRA
In reply to Peter RobinsonMigrate USB_EHCI_TEGRA from headers to Kconfig
--- 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(-)
configs/apalis-tk1_defconfig +1 -0
@@ -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"
configs/apalis_t30_defconfig +1 -0
@@ -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"
configs/beaver_defconfig +1 -0
@@ -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"
configs/cardhu_defconfig +1 -0
@@ -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
configs/cei-tk1-som_defconfig +1 -0
@@ -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"
configs/colibri_t20_defconfig +1 -0
@@ -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
configs/colibri_t30_defconfig +1 -0
@@ -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"
configs/dalmore_defconfig +1 -0
@@ -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"
configs/e2220-1170_defconfig +1 -0
@@ -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"
configs/harmony_defconfig +1 -0
@@ -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
configs/jetson-tk1_defconfig +1 -0
@@ -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"
configs/medcom-wide_defconfig +1 -0
@@ -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
configs/nyan-big_defconfig +1 -0
@@ -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"
configs/p2371-0000_defconfig +1 -0
@@ -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"
configs/p2371-2180_defconfig +1 -0
@@ -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"
configs/p2571_defconfig +1 -0
@@ -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"
configs/paz00_defconfig +1 -0
@@ -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
configs/plutux_defconfig +1 -0
@@ -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
configs/seaboard_defconfig +1 -0
@@ -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
configs/tec-ng_defconfig +1 -0
@@ -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
configs/tec_defconfig +1 -0
@@ -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
configs/trimslice_defconfig +1 -0
@@ -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
configs/venice2_defconfig +1 -0
@@ -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"
configs/ventana_defconfig +1 -0
@@ -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
drivers/usb/host/Kconfig +6 -0
@@ -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
include/configs/apalis-tk1.h +0 -3
@@ -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
include/configs/apalis_t30.h +0 -3
@@ -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
include/configs/beaver.h +0 -3
@@ -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"
include/configs/cardhu.h +0 -3
@@ -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 */
include/configs/cei-tk1-som.h +0 -3
@@ -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"
include/configs/colibri_t20.h +0 -4
@@ -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
include/configs/colibri_t30.h +0 -3
@@ -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
include/configs/dalmore.h +0 -3
@@ -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"
include/configs/e2220-1170.h +0 -3
@@ -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"
include/configs/harmony.h +0 -3
@@ -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 */
include/configs/jetson-tk1.h +0 -3
@@ -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"
include/configs/medcom-wide.h +0 -3
@@ -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 */
include/configs/nyan-big.h +0 -3
@@ -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
include/configs/p2371-0000.h +0 -3
@@ -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"
include/configs/p2371-2180.h +0 -3
@@ -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"
include/configs/p2571.h +0 -3
@@ -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"
include/configs/paz00.h +0 -3
@@ -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 */
include/configs/plutux.h +0 -3
@@ -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 */
include/configs/seaboard.h +0 -3
@@ -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
include/configs/tec-ng.h +0 -3
@@ -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
include/configs/tec.h +0 -3
@@ -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 */
include/configs/trimslice.h +0 -3
@@ -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 */
include/configs/venice2.h +0 -3
@@ -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"
include/configs/ventana.h +0 -3
@@ -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 */
scripts/config_whitelist.txt +0 -1
@@ -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
Signature · 1 line
2.19.0
PATCH 4/6 Kconfig: tegra: Migrate USB_EHCI_TEGRA
Quoted 12 lines · Peter Robinson
Migrate
USB_EHCI_TEGRAfrom headers toKconfigSigned-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Marek Vasut <[email protected]>Cc Marcel Ziswiler <[email protected]>Cc Peter.Chubb at data61.csiro.auCc Lucas Stach <[email protected]>Cc Stefan Agner <[email protected]>Cc Alban Bedel <[email protected]>Cc Allen Martin <[email protected]>
Looks fine to me.
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
Quoted 735 lines
--- 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(-)configs/apalis- renamed from configs/apalis-tk1_defconfig +0
-0
tk1_defconfig
indexca5ded8e946..10eb006ce58100644configs/apalis-tk1_defconfig +1
-0@@ -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"configs/apalis_t30_defconfig +1
-0@@ -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"configs/beaver_defconfig +1
-0@@ -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"configs/cardhu_defconfig +1
-0@@ -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=yconfigs/cei-tk1- renamed from configs/cei-tk1-som_defconfig +0
-0
som_defconfig
index5ea257e778d..cdb8e643480100644configs/cei-tk1-som_defconfig +1
-0@@ -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"configs/colibri_t20_defconfig +1
-0@@ -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=yconfigs/colibri_t30_defconfig +1
-0@@ -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"configs/dalmore_defconfig +1
-0@@ -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"configs/e2220- renamed from configs/e2220-1170_defconfig +0
-01170_defconfig
indexb13ad39abe8..bd85e626c63100644configs/e2220-1170_defconfig +1
-0@@ -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"configs/harmony_defconfig +1
-0@@ -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=yconfigs/jetson- renamed from configs/jetson-tk1_defconfig +0
-0
tk1_defconfig
indexba7a463d47a..cd8643266c2100644configs/jetson-tk1_defconfig +1
-0@@ -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"configs/medcom- renamed from configs/medcom-wide_defconfig +0
-0
wide_defconfig
indexc2cd298aaaf..726cf498bd5100644configs/medcom-wide_defconfig +1
-0@@ -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=yconfigs/nyan-big_defconfig +1
-0@@ -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"configs/p2371- renamed from configs/p2371-0000_defconfig +0
-00000_defconfig
index30d28f6ee5c..92040b8e68b100644configs/p2371-0000_defconfig +1
-0@@ -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"configs/p2371- renamed from configs/p2371-2180_defconfig +0
-02180_defconfig
index3ad43ff5cd8..e7e6ee032bc100644configs/p2371-2180_defconfig +1
-0@@ -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"configs/p2571_defconfig +1
-0@@ -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"configs/paz00_defconfig +1
-0@@ -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=yconfigs/plutux_defconfig +1
-0@@ -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=yconfigs/seaboard_defconfig +1
-0@@ -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=yconfigs/tec-ng_defconfig +1
-0@@ -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=yconfigs/tec_defconfig +1
-0@@ -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=yconfigs/trimslice_defconfig +1
-0@@ -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=yconfigs/venice2_defconfig +1
-0@@ -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"configs/ventana_defconfig +1
-0@@ -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=ydrivers/usb/host/Kconfig +6
-0@@ -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_ZYNQinclude/configs/apalis- renamed from include/configs/apalis-tk1.h +0
-0
tk1.h
index05c958a8fea..1d296ba51a0100644include/configs/apalis-tk1.h +0
-3@@ -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_SHOWinclude/configs/apalis_t30.h +0
-3@@ -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 include/configs/beaver.h +0
-3@@ -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" include/configs/cardhu.h +0
-3@@ -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 */ include/configs/cei-tk1- renamed from include/configs/cei-tk1-som.h +0
-0
som.h
index7ba17a6fd63..74305f1b6e7100644include/configs/cei-tk1-som.h +0
-3@@ -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" include/configs/colibri_t20.h +0
-4@@ -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 1536include/configs/colibri_t30.h +0
-3@@ -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 16352include/configs/dalmore.h +0
-3@@ -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" include/configs/e2220- renamed from include/configs/e2220-1170.h +0
-01170.h
index1e917345d81..30c0c7fee78100644include/configs/e2220-1170.h +0
-3@@ -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" include/configs/harmony.h +0
-0@@ -32,9 +32,6 @@/* Environment in NAND (which is 512M), aligned to start of last sector */
#defineCONFIG_ENV_OFFSET(SZ_512M-SZ_128K) /* 128K sector
size */include/configs/harmony.h +0
-3-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/jetson- renamed from include/configs/jetson-tk1.h +0
-0
tk1.h
indexf93c81a6d42..7b2c7947e94100644include/configs/jetson-tk1.h +0
-3@@ -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" include/configs/medcom- renamed from include/configs/medcom-wide.h +0
-0
wide.h
index88976fed64c..d212a7f680f100644include/configs/medcom-wide.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K sectors */
include/configs/medcom-wide.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/nyan-big.h +0
-3@@ -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_LOADADDRinclude/configs/p2371- renamed from include/configs/p2371-0000.h +0
-00000.h
index5843cc00eb1..59866997e3f100644include/configs/p2371-0000.h +0
-3@@ -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" include/configs/p2371- renamed from include/configs/p2371-2180.h +0
-02180.h
index3486cc8117e..c97b2260277100644include/configs/p2371-2180.h +0
-3@@ -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" include/configs/p2571.h +0
-3@@ -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" include/configs/paz00.h +0
-3@@ -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 */ include/configs/plutux.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K sectors */
include/configs/plutux.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/seaboard.h +0
-3@@ -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 include/configs/tec-ng.h +0
-3@@ -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 include/configs/tec.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K sectors */
include/configs/tec.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/trimslice.h +0
-3@@ -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 */ include/configs/venice2.h +0
-3@@ -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" include/configs/ventana.h +0
-3@@ -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 */ scripts/config_whitelist.txt +0
-1@@ -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
PATCH 4/6 Kconfig: tegra: Migrate USB_EHCI_TEGRA
Quoted 16 lines · Marcel Ziswiler
Quoted 12 lines · Peter Robinson
Migrate
USB_EHCI_TEGRAfrom headers toKconfigSigned-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Marek Vasut <[email protected]>Cc Marcel Ziswiler <[email protected]>Cc Peter.Chubb at data61.csiro.auCc Lucas Stach <[email protected]>Cc Stefan Agner <[email protected]>Cc Alban Bedel <[email protected]>Cc Allen Martin <[email protected]>Looks fine to me.
Quoted 8 lines
Reviewed-by Marcel Ziswiler <[email protected]>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
Quoted 746 lines
Quoted 746 lines
--- 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(-)configs/apalis- renamed from configs/apalis-tk1_defconfig +0
-0
tk1_defconfig
indexca5ded8e946..10eb006ce58100644configs/apalis-tk1_defconfig +1
-0@@ -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"configs/apalis_t30_defconfig +1
-0@@ -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"configs/beaver_defconfig +1
-0@@ -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"configs/cardhu_defconfig +1
-0@@ -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=yconfigs/cei-tk1- renamed from configs/cei-tk1-som_defconfig +0
-0
som_defconfig
index5ea257e778d..cdb8e643480100644configs/cei-tk1-som_defconfig +1
-0@@ -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"configs/colibri_t20_defconfig +1
-0@@ -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=yconfigs/colibri_t30_defconfig +1
-0@@ -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"configs/dalmore_defconfig +1
-0@@ -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"configs/e2220- renamed from configs/e2220-1170_defconfig +0
-01170_defconfig
indexb13ad39abe8..bd85e626c63100644configs/e2220-1170_defconfig +1
-0@@ -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"configs/harmony_defconfig +1
-0@@ -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=yconfigs/jetson- renamed from configs/jetson-tk1_defconfig +0
-0
tk1_defconfig
indexba7a463d47a..cd8643266c2100644configs/jetson-tk1_defconfig +1
-0@@ -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"configs/medcom- renamed from configs/medcom-wide_defconfig +0
-0
wide_defconfig
indexc2cd298aaaf..726cf498bd5100644configs/medcom-wide_defconfig +1
-0@@ -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=yconfigs/nyan- renamed from configs/nyan-big_defconfig +0
-0
big_defconfig
index4a8e864b7e1..f20607b9a78100644configs/nyan-big_defconfig +1
-0@@ -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"configs/p2371- renamed from configs/p2371-0000_defconfig +0
-00000_defconfig
index30d28f6ee5c..92040b8e68b100644configs/p2371-0000_defconfig +1
-0@@ -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"configs/p2371- renamed from configs/p2371-2180_defconfig +0
-02180_defconfig
index3ad43ff5cd8..e7e6ee032bc100644configs/p2371-2180_defconfig +1
-0@@ -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"configs/p2571_defconfig +1
-0@@ -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"configs/paz00_defconfig +1
-0@@ -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=yconfigs/plutux_defconfig +1
-0@@ -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=yconfigs/seaboard_defconfig +1
-0@@ -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=yconfigs/tec-ng_defconfig +1
-0@@ -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=yconfigs/tec_defconfig +1
-0@@ -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=yconfigs/trimslice_defconfig +1
-0@@ -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=yconfigs/venice2_defconfig +1
-0@@ -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"configs/ventana_defconfig +1
-0@@ -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=ydrivers/usb/host/Kconfig +2
-0@@ -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 USBcontroller"
drivers/usb/host/Kconfig +4
-0+ 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_ZYNQinclude/configs/apalis- renamed from include/configs/apalis-tk1.h +0
-0
tk1.h
index05c958a8fea..1d296ba51a0100644include/configs/apalis-tk1.h +0
-3@@ -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_SHOWinclude/configs/apalis_t30.h +0
-3@@ -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 include/configs/beaver.h +0
-3@@ -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" include/configs/cardhu.h +0
-3@@ -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 */ include/configs/cei- renamed from include/configs/cei-tk1-som.h +0
-0tk1-
som.h
index7ba17a6fd63..74305f1b6e7100644include/configs/cei-tk1-som.h +0
-3@@ -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" include/configs/colibri_t20.h +0
-4@@ -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 1536include/configs/colibri_t30.h +0
-3@@ -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 16352include/configs/dalmore.h +0
-3@@ -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" include/configs/e2220- renamed from include/configs/e2220-1170.h +0
-01170.h
index1e917345d81..30c0c7fee78100644include/configs/e2220-1170.h +0
-3@@ -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" include/configs/harmony.h +0
-0@@ -32,9 +32,6 @@/* Environment in NAND (which is 512M), aligned to start of last sector */
#defineCONFIG_ENV_OFFSET(SZ_512M-SZ_128K) /* 128K
sector
size */include/configs/harmony.h +0
-3-/* USB Host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/jetson- renamed from include/configs/jetson-tk1.h +0
-0
tk1.h
indexf93c81a6d42..7b2c7947e94100644include/configs/jetson-tk1.h +0
-3@@ -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" include/configs/medcom- renamed from include/configs/medcom-wide.h +0
-0
wide.h
index88976fed64c..d212a7f680f100644include/configs/medcom-wide.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K
sectors */include/configs/medcom-wide.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/nyan- renamed from include/configs/nyan-big.h +0
-0
big.h
indexbb982011906..3d43839e413100644include/configs/nyan-big.h +0
-3@@ -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_LOADADDRinclude/configs/p2371- renamed from include/configs/p2371-0000.h +0
-00000.h
index5843cc00eb1..59866997e3f100644include/configs/p2371-0000.h +0
-3@@ -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" include/configs/p2371- renamed from include/configs/p2371-2180.h +0
-02180.h
index3486cc8117e..c97b2260277100644include/configs/p2371-2180.h +0
-3@@ -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" include/configs/p2571.h +0
-3@@ -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" include/configs/paz00.h +0
-3@@ -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 */ include/configs/plutux.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K
sectors */include/configs/plutux.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/seaboard.h +0
-3@@ -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 include/configs/tec-ng.h +0
-3@@ -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 include/configs/tec.h +0
-0@@ -25,9 +25,6 @@/* Environment in NAND, aligned to start of last sector */ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K)/* 128K
sectors */include/configs/tec.h +0
-3-/* USB host support */ -#define CONFIG_USB_EHCI_TEGRA -#include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/trimslice.h +0
-3@@ -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 */ include/configs/venice2.h +0
-3@@ -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" include/configs/ventana.h +0
-3@@ -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 */ scripts/config_whitelist.txt +0
-1@@ -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
PATCH 5/6 Kconfig: tegra: Migrate TEGRA_KEYBOARD
In reply to Peter RobinsonMigrate 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.
--- 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(-)
configs/seaboard_defconfig +1 -0
@@ -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
drivers/input/Kconfig +6 -0
@@ -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
include/configs/seaboard.h +0 -4
@@ -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
scripts/config_whitelist.txt +0 -1
@@ -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
Signature · 1 line
2.19.0
PATCH 5/6 Kconfig: tegra: Migrate TEGRA_KEYBOARD
Quoted 8 lines · Peter Robinson
Migrate
TEGRA_KEYBOARDfrom headers toKconfig, only the seaboard uses it but we
dropCONFIG_KEYBOARDas the driver doesn't use the legacydrv_keyboard_init.Signed-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>
Quoted 67 lines
--- 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(-)configs/seaboard_defconfig +1
-0@@ -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=ydrivers/input/Kconfig +0
-0@@ -25,6 +25,12 @@ config I8042_KEYB variable 'keymap' to "de" to select German. Keyboardrepeat is
drivers/input/Kconfig +2
-0handled by the keyboard itself. +config TEGRA_KEYBOARD + bool "NVIDIA Tegra internal matrix keyboard controllersupport"
drivers/input/Kconfig +2
-0+ help + A matrix keyboard connected directly to the internalkeyboard
drivers/input/Kconfig +2
-0+ controller on Tegra SoCs. + config TWL4030_INPUT bool "Enable TWL4030 Input controller" helpinclude/configs/seaboard.h +0
-4@@ -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 scripts/config_whitelist.txt +0
-1@@ -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
PATCH 6/6 nyan-big: drop CONFIG_KEYBOARD
In reply to Peter RobinsonThe CONFIG_KEYBOARD does nothing as it's legacy and unused so just drop it from the config.
--- include/configs/nyan-big.h | 2 -- 1 file changed, 2 deletions(-)
include/configs/nyan-big.h +0 -2
@@ -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
Signature · 1 line
2.19.0
PATCH 6/6 nyan-big: drop CONFIG_KEYBOARD
Quoted 7 lines · Peter Robinson
The
CONFIG_KEYBOARDdoes nothing as it's legacy and unused so just drop it from the config.Signed-off-by Peter Robinson <[email protected]>Cc Tom Warren <[email protected]>Cc Stephen Warren <[email protected]>Cc Allen Martin <[email protected]>
Quoted 16 lines
--- include/configs/nyan-big.h | 2 -- 1 file changed, 2 deletions(-)include/configs/nyan-big.h +0
-2@@ -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
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
Quoted 4 lines · Peter Robinson
The following patches are a few cleanups to dangling comments from
Kconfigcleanups and migrations ofSYS_I2C_TEGRA,USB_EHCI_TEGRAandTEGRA_KEYBOARD. There's also a couple of other minors fixes and cleanups as well.
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 <[email protected]>
Sent: Wednesday, November 7, 2018 7:12 AM
To: u-boot at lists.denx.de; Tom Warren <[email protected]>; Tom Rini <[email protected]>
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
Quoted 4 lines · Peter Robinson
The following patches are a few cleanups to dangling comments from
Kconfigcleanups and migrations ofSYS_I2C_TEGRA,USB_EHCI_TEGRAandTEGRA_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.
-----------------------------------------------------------------------------------
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 <[email protected]>; u-boot at lists.denx.de; Tom Rini <[email protected]>
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 <[email protected]>
Sent: Wednesday, November 7, 2018 7:12 AM
To: u-boot at lists.denx.de; Tom Warren <[email protected]>; Tom Rini <[email protected]>
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
Quoted 4 lines · Peter Robinson
The following patches are a few cleanups to dangling comments from
Kconfigcleanups and migrations ofSYS_I2C_TEGRA,USB_EHCI_TEGRAandTEGRA_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.
-----------------------------------------------------------------------------------
Tom,
Quoted 1 line
The
SYS_I2Cpatch 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
Quoted 75 lines
tom at tom-lt2:~/denx/uboot-tegra$ git am -s --whitespace=strip ~/Downloads/bundle-17667-Peter-cleanup-6.mbox
Applying: tegra: cleanup dangling comments ininclude/configs
Applying: tegra20: common: fixUSB_EHCI_TXFIFO_THRESHvalue
Applying:Kconfig: tegra: MigrateSYS_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 0003Kconfig: tegra: MigrateSYS_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 <[email protected]>; u-boot at lists.denx.de; Tom Rini <[email protected]>
Subject: RE: Some tegra cleanups andKconfigmigrationsSorry, Peter. I missed these. I'll take a look today and get a PR out to Tom before EOW.
-----Original Message-----
From: Peter Robinson <[email protected]>
Sent: Wednesday, November 7, 2018 7:12 AM
To: u-boot at lists.denx.de; Tom Warren <[email protected]>; Tom Rini <[email protected]>
Subject: Re: Some tegra cleanups andKconfigmigrationsTom 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
Quoted 4 lines · Peter Robinson
The following patches are a few cleanups to dangling comments from
Kconfigcleanups and migrations ofSYS_I2C_TEGRA,USB_EHCI_TEGRAandTEGRA_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.
-----------------------------------------------------------------------------------