Commit 84260a49 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.2-arm-defconfig' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 7b3320e6 a6f3d883

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/tegra_defconfig

+17 −19
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y
@@ -14,23 +15,9 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_MSI=y

CONFIG_PCI_TEGRA=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_KEXEC=y
@@ -40,6 +27,13 @@ CONFIG_CPUFREQ_DT=y 
CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_TRUSTED_FOUNDATIONS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_CMA=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -73,10 +67,12 @@ CONFIG_MAC80211=y 
CONFIG_RFKILL=y

CONFIG_RFKILL_INPUT=y

CONFIG_RFKILL_GPIO=y

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_MSI=y

CONFIG_PCI_TEGRA=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_TEGRA_GMI=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y
@@ -152,7 +148,6 @@ CONFIG_WATCHDOG=y 
CONFIG_TEGRA_WATCHDOG=y

CONFIG_MFD_AS3722=y

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_SPI=y

CONFIG_MFD_MAX8907=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_PALMAS=y
@@ -180,6 +175,7 @@ CONFIG_DRM_NOUVEAU=m 
CONFIG_DRM_TEGRA=y

CONFIG_DRM_PANEL_SIMPLE=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -288,6 +284,10 @@ CONFIG_NFS_V4=y 
CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRC_CCITT=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y
@@ -300,5 +300,3 @@ CONFIG_DEBUG_MUTEXES=y 
CONFIG_DEBUG_SG=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y
 
CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRC_CCITT=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE