diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 17:52:13 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 17:52:13 +0100 |
commit | aa26d828df8fddc21a8de64adb6e225996fbbe34 (patch) | |
tree | e57085bc7f40f6896c03a9a0900c52a538ddf73c /arch/arm64/configs/defconfig | |
parent | Merge tag 'stm32-config-for-v5.11-1' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | arm64: defconfig: Enable Tegra234 support (diff) | |
download | linux-aa26d828df8fddc21a8de64adb6e225996fbbe34.tar.xz linux-aa26d828df8fddc21a8de64adb6e225996fbbe34.zip |
Merge tag 'tegra-for-5.11-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
arm64: tegra: Default configuration changes for v5.11-rc1
The Tegra234 VDK support that was introduced in v5.10-rc1 is now enabled
by default.
* tag 'tegra-for-5.11-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: defconfig: Enable Tegra234 support
Link: https://lore.kernel.org/r/20201127144329.124891-6-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs/defconfig')
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bdaadad7f0a4..24ee4ac17252 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -960,6 +960,7 @@ CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_ARCH_TEGRA_210_SOC=y CONFIG_ARCH_TEGRA_186_SOC=y CONFIG_ARCH_TEGRA_194_SOC=y +CONFIG_ARCH_TEGRA_234_SOC=y CONFIG_ARCH_K3_AM6_SOC=y CONFIG_ARCH_K3_J721E_SOC=y CONFIG_TI_SCI_PM_DOMAINS=y |