ARM: dts: sun8i: Update A80 dts(i) from Linux-v4.18-rc3

[oweals/u-boot.git] / arch / arm / mach-tegra / Kconfig

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 58085dc0a36b8f5eec3fe276db78f23eaa3a5dd1..86b1cd11f752c4573a381419c71bb098ec50ff26 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -22,6 +22,8 @@ config TEGRA_IVC
 
 config TEGRA_COMMON
        bool "Tegra common options"
+       select BINMAN
+       select BOARD_EARLY_INIT_F
        select CLK
        select DM
        select DM_ETH
@@ -36,8 +38,9 @@ config TEGRA_COMMON
        select DM_SPI_FLASH
        select MISC
        select OF_CONTROL
+       select SPI
        select VIDCONSOLE_AS_LCD if DM_VIDEO
-       select BOARD_EARLY_INIT_F
+       imply CMD_DM
        imply CRC32_VERIFY
 
 config TEGRA_NO_BPMP
@@ -48,7 +51,7 @@ config TEGRA_NO_BPMP
 
 config TEGRA_ARMV7_COMMON
        bool "Tegra 32-bit common options"
-       select CPU_V7
+       select CPU_V7A
        select SPL
        select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
@@ -59,8 +62,13 @@ config TEGRA_ARMV7_COMMON
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
        select ARM64
+       select LINUX_KERNEL_IMAGE_HEADER
        select TEGRA_COMMON
-       imply ENV_IS_IN_MMC
+
+if TEGRA_ARMV8_COMMON
+config LNX_KRNL_IMG_TEXT_OFFSET_BASE
+       default 0x80000000
+endif
 
 choice
        prompt "Tegra SoC select"
@@ -78,7 +86,6 @@ config TEGRA30
        select ARM_ERRATA_743622
        select ARM_ERRATA_751472
        select TEGRA_ARMV7_COMMON
-       imply ENV_IS_IN_MMC
 
 config TEGRA114
        bool "Tegra114 family"
@@ -87,14 +94,13 @@ config TEGRA114
 config TEGRA124
        bool "Tegra124 family"
        select TEGRA_ARMV7_COMMON
-       imply ENV_IS_IN_MMC
        imply REGMAP
        imply SYSCON
 
 config TEGRA210
        bool "Tegra210 family"
-       select TEGRA_GPIO
        select TEGRA_ARMV8_COMMON
+       select TEGRA_GPIO
        select TEGRA_NO_BPMP
 
 config TEGRA186