X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Fmach-tegra%2FKconfig;h=b18a12e34203e9d467d381a05e8e1d2eb36bd8b7;hb=f15715afea3e7b576fad1f6877a073b65576a335;hp=8569167369c5b709062fb1a72918c3995939b81b;hpb=e02ee2548afe22f7d197b89df2ae7bd72f1df630;p=u-boot

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 8569167369..b18a12e342 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,52 +1,87 @@
 if TEGRA
 
+config TEGRA_COMMON
+	bool "Tegra common options"
+	select DM
+	select DM_ETH
+	select DM_GPIO
+	select DM_I2C
+	select DM_KEYBOARD
+	select DM_PCI
+	select DM_PCI_COMPAT
+	select DM_PWM
+	select DM_SERIAL
+	select DM_SPI
+	select DM_SPI_FLASH
+	select OF_CONTROL
+	select VIDCONSOLE_AS_LCD if DM_VIDEO
+
+config TEGRA_ARMV7_COMMON
+	bool "Tegra 32-bit common options"
+	select CPU_V7
+	select SPL
+	select SUPPORT_SPL
+	select TEGRA_COMMON
+	select TEGRA_GPIO
+
+config TEGRA_ARMV8_COMMON
+	bool "Tegra 64-bit common options"
+	select ARM64
+	select TEGRA_COMMON
+
 choice
 	prompt "Tegra SoC select"
+	optional
 
 config TEGRA20
 	bool "Tegra20 family"
+	select TEGRA_ARMV7_COMMON
 
 config TEGRA30
 	bool "Tegra30 family"
+	select TEGRA_ARMV7_COMMON
 
 config TEGRA114
 	bool "Tegra114 family"
+	select TEGRA_ARMV7_COMMON
 
 config TEGRA124
 	bool "Tegra124 family"
+	select TEGRA_ARMV7_COMMON
+
+config TEGRA210
+	bool "Tegra210 family"
+	select TEGRA_GPIO
+	select TEGRA_ARMV8_COMMON
+
+config TEGRA186
+	bool "Tegra186 family"
+	select TEGRA186_GPIO
+	select TEGRA_ARMV8_COMMON
 
 endchoice
 
-config SYS_MALLOC_F
+config TEGRA_DISCONNECT_UDC_ON_BOOT
+	bool "Disconnect USB device mode controller on boot"
 	default y
+	help
+	  When loading U-Boot into RAM over USB protocols using tools such as
+	  tegrarcm or L4T's exec-uboot.sh/tegraflash.py, Tegra's USB device
+	  mode controller is initialized and enumerated by the host PC running
+	  the tool. Unfortunately, these tools do not shut down the USB
+	  controller before executing the downloaded code, and so the host PC
+	  does not "de-enumerate" the USB device. This option shuts down the
+	  USB controller when U-Boot boots to avoid leaving a stale USB device
+	  present.
 
 config SYS_MALLOC_F_LEN
 	default 0x1800
 
-config USE_PRIVATE_LIBGCC
-	default y
-
-config DM
-	default y if !SPL_BUILD
-
-config DM_SERIAL
-	default y if !SPL_BUILD
-
-config DM_SPI
-	default y if !SPL_BUILD
-
-config DM_SPI_FLASH
-	default y if !SPL_BUILD
-
-config DM_I2C
-	default y if !SPL_BUILD
-
-config DM_GPIO
-	default y if !SPL_BUILD
-
 source "arch/arm/mach-tegra/tegra20/Kconfig"
 source "arch/arm/mach-tegra/tegra30/Kconfig"
 source "arch/arm/mach-tegra/tegra114/Kconfig"
 source "arch/arm/mach-tegra/tegra124/Kconfig"
+source "arch/arm/mach-tegra/tegra210/Kconfig"
+source "arch/arm/mach-tegra/tegra186/Kconfig"
 
 endif