Revert "UBUNTU: SAUCE: (efi-lockdown) Add a SysRq option to lift kernel lockdown"

[mirror_ubuntu-bionic-kernel.git] / debian.master / config / armhf / config.common.armhf

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 4b01fabaffa664fb9e8107f87f414b17f45ccfb1..83e558265e83fa29f8d23ae82af0fbc27c383de4 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -24,7 +24,6 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUNXI is not set
@@ -91,7 +90,7 @@ CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
 CONFIG_EEPROM_93CX6=m
-# CONFIG_EFI is not set
+CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFS_FS=m
 CONFIG_EM_TIMER_STI=y
 CONFIG_ENCLOSURE_SERVICES=m
@@ -112,7 +111,6 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FUSION=y
 CONFIG_GAMEPORT=m
@@ -184,7 +182,7 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-# CONFIG_LOCK_DOWN_KERNEL is not set
+CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
@@ -206,7 +204,6 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MT6397=m
-CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
@@ -215,6 +212,8 @@ CONFIG_MFD_TPS65217=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
+CONFIG_MISC_RTSX=m
+CONFIG_MISC_RTSX_PCI=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
@@ -285,6 +284,7 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NVMEM=y
 CONFIG_N_GSM=m
+# CONFIG_OCXL_BASE is not set
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
 CONFIG_OSF_PARTITION=y
@@ -333,7 +333,6 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
-CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=y
@@ -415,6 +414,7 @@ CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SGL_ALLOC=y
 CONFIG_SG_SPLIT=y
 CONFIG_SH_TIMER_CMT=y
 CONFIG_SH_TIMER_MTU2=y
@@ -454,6 +454,8 @@ CONFIG_TIFM_CORE=m
 CONFIG_TI_CPSW_ALE=y
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TRACE_SINK=m
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TTY_PRINTK=y
 CONFIG_UFS_FS=m
 CONFIG_UIO_AEC=m