diff options
author | Olof Johansson | 2019-04-28 23:36:26 -0700 |
---|---|---|
committer | Olof Johansson | 2019-04-28 23:36:26 -0700 |
commit | 84260a4915beca1fa2bb4493e9fdedfe4cbdae4a (patch) | |
tree | a703d47711425b5778c7ee1ed055a2be4c3d9f5c /arch/arm/configs/multi_v7_defconfig | |
parent | 7b3320e6b1795d68b7e30eb3fad0860f2664aedd (diff) | |
parent | a6f3d883a6ef19feee1d80bfd90701627b01b98a (diff) |
Merge tag 'tegra-for-5.2-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
ARM: tegra: Default configuration updates for v5.2-rc1
Enable Trusted Foundations support in the default configurations for
Tegra and multi-v7. This is necessary because the symbol is no longer
selected by default.
* tag 'tegra-for-5.2-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: Enable Trusted Foundations for multiplatform ARM v7
ARM: tegra: Enable Trusted Foundations by default
ARM: tegra: Update default configuration for v5.1-rc1
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 939015b73444..547775ffc383 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -110,6 +110,7 @@ CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y CONFIG_KERNEL_MODE_NEON=y CONFIG_RASPBERRYPI_FIRMWARE=y +CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_SPROM=y CONFIG_EFI_VARS=m |