Skip to content

Commit

Permalink
defonfig: sync for 1.4 release
Browse files Browse the repository at this point in the history
Signed-off-by: ethan-halsall <ethan.halsall@gmail.com>
  • Loading branch information
ethan-halsall committed Aug 13, 2019
1 parent 49ead5a commit a58fed3
Show file tree
Hide file tree
Showing 4 changed files with 190 additions and 139 deletions.
68 changes: 34 additions & 34 deletions arch/arm64/configs/revenge_defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.9.188 Kernel Configuration
# Linux/arm64 4.9.189 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
Expand Down Expand Up @@ -523,6 +523,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_VM_MAX_READAHEAD=2048
CONFIG_ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT=y
CONFIG_SPECULATIVE_PAGE_FAULT=y
CONFIG_VMSTAT_INTERVAL=10
CONFIG_ARM64_DMA_USE_IOMMU=y
CONFIG_ARM64_DMA_IOMMU_ALIGNMENT=9
CONFIG_SECCOMP=y
Expand Down Expand Up @@ -1287,7 +1288,6 @@ CONFIG_OF_BATTERYDATA=y
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_ZRAM is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
Expand Down Expand Up @@ -4133,38 +4133,38 @@ CONFIG_ION_MSM=y
#
CONFIG_QCA_CLD_WLAN=y
CONFIG_QCACLD_WLAN_LFR3=y
CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
CONFIG_WLAN_FEATURE_11W=y
CONFIG_WLAN_FEATURE_LPSS=y
CONFIG_QCOM_VOWIFI_11R=y
CONFIG_QCACLD_FEATURE_NAN=y
CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
CONFIG_QCACLD_FEATURE_GREEN_AP=y
CONFIG_HELIUMPLUS=y
CONFIG_64BIT_PADDR=y
CONFIG_QCOM_TDLS=y
CONFIG_QCOM_LTE_COEX=y
CONFIG_MPC_UT_FRAMEWORK=y
CONFIG_WLAN_OFFLOAD_PACKETS=y
CONFIG_FEATURE_TSO=y
# CONFIG_FEATURE_TSO_DEBUG is not set
CONFIG_WLAN_FASTPATH=y
CONFIG_WLAN_NAPI=y
# CONFIG_WLAN_NAPI_DEBUG is not set
CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
CONFIG_WLAN_SYNC_TSF=y
CONFIG_LFR_SUBNET_DETECTION=y
CONFIG_MCC_TO_SCC_SWITCH=y
CONFIG_QCACLD_WLAN_LFR2=y
CONFIG_WLAN_FEATURE_DISA=y
CONFIG_ICMP_DISABLE_PS=y
CONFIG_BUILD_TIMESTAMP=y
# CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 is not set
CONFIG_WLAN_FEATURE_FILS=y
# CONFIG_WLAN_FEATURE_OWE is not set
# CONFIG_WLAN_FEATURE_GMAC is not set
# CONFIG_WLAN_FEATURE_SAE is not set
CONFIG_QCACLD_FEATURE_METERING=y
CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
CONFIG_WLAN_FEATURE_11W=y
CONFIG_WLAN_FEATURE_LPSS=y
CONFIG_QCOM_VOWIFI_11R=y
CONFIG_QCACLD_FEATURE_NAN=y
CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
CONFIG_QCACLD_FEATURE_GREEN_AP=y
CONFIG_HELIUMPLUS=y
CONFIG_64BIT_PADDR=y
CONFIG_QCOM_TDLS=y
CONFIG_QCOM_LTE_COEX=y
CONFIG_MPC_UT_FRAMEWORK=y
CONFIG_WLAN_OFFLOAD_PACKETS=y
CONFIG_FEATURE_TSO=y
# CONFIG_FEATURE_TSO_DEBUG is not set
CONFIG_WLAN_FASTPATH=y
CONFIG_WLAN_NAPI=y
# CONFIG_WLAN_NAPI_DEBUG is not set
CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
CONFIG_WLAN_SYNC_TSF=y
CONFIG_LFR_SUBNET_DETECTION=y
CONFIG_MCC_TO_SCC_SWITCH=y
CONFIG_QCACLD_WLAN_LFR2=y
CONFIG_WLAN_FEATURE_DISA=y
CONFIG_ICMP_DISABLE_PS=y
CONFIG_BUILD_TIMESTAMP=y
# CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 is not set
CONFIG_WLAN_FEATURE_FILS=y
# CONFIG_WLAN_FEATURE_OWE is not set
# CONFIG_WLAN_FEATURE_GMAC is not set
# CONFIG_WLAN_FEATURE_SAE is not set
CONFIG_QCACLD_FEATURE_METERING=y
# CONFIG_QCA_CLD_DEBUG is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
Expand Down
87 changes: 52 additions & 35 deletions arch/arm64/configs/simple-beryllium_defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.9.186 Kernel Configuration
# Linux/arm64 4.9.189 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
Expand Down Expand Up @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-Simple-Reloaded-1.3"
CONFIG_LOCALVERSION="-Simple-Reloaded-1.4"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_DEFAULT_HOSTNAME="(none)"
# CONFIG_SWAP is not set
Expand Down Expand Up @@ -241,6 +241,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_GENERIC_IDLE_POLL_SETUP=y
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_DMA_API_DEBUG=y
Expand All @@ -262,10 +263,15 @@ CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_THIN_ARCHIVES=y
CONFIG_LD_BFD=y
# CONFIG_LD_GOLD is not set
# CONFIG_LD_LLD is not set
# CONFIG_LTO is not set
CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
CONFIG_LTO_NONE=y
# CONFIG_LTO_CLANG is not set
# CONFIG_POLLY_CLANG is not set
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
Expand Down Expand Up @@ -517,6 +523,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_VM_MAX_READAHEAD=2048
CONFIG_ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT=y
CONFIG_SPECULATIVE_PAGE_FAULT=y
CONFIG_VMSTAT_INTERVAL=10
CONFIG_ARM64_DMA_USE_IOMMU=y
CONFIG_ARM64_DMA_IOMMU_ALIGNMENT=9
CONFIG_SECCOMP=y
Expand Down Expand Up @@ -1288,7 +1295,6 @@ CONFIG_OF_BATTERYDATA=y
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_NULL_BLK is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_ZRAM is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
Expand Down Expand Up @@ -4126,38 +4132,38 @@ CONFIG_ION_MSM=y
#
CONFIG_QCA_CLD_WLAN=y
CONFIG_QCACLD_WLAN_LFR3=y
CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
CONFIG_WLAN_FEATURE_11W=y
CONFIG_WLAN_FEATURE_LPSS=y
CONFIG_QCOM_VOWIFI_11R=y
CONFIG_QCACLD_FEATURE_NAN=y
CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
CONFIG_QCACLD_FEATURE_GREEN_AP=y
CONFIG_HELIUMPLUS=y
CONFIG_64BIT_PADDR=y
CONFIG_QCOM_TDLS=y
CONFIG_QCOM_LTE_COEX=y
CONFIG_MPC_UT_FRAMEWORK=y
CONFIG_WLAN_OFFLOAD_PACKETS=y
CONFIG_FEATURE_TSO=y
# CONFIG_FEATURE_TSO_DEBUG is not set
CONFIG_WLAN_FASTPATH=y
CONFIG_WLAN_NAPI=y
# CONFIG_WLAN_NAPI_DEBUG is not set
CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
CONFIG_WLAN_SYNC_TSF=y
CONFIG_LFR_SUBNET_DETECTION=y
CONFIG_MCC_TO_SCC_SWITCH=y
CONFIG_QCACLD_WLAN_LFR2=y
CONFIG_WLAN_FEATURE_DISA=y
CONFIG_ICMP_DISABLE_PS=y
CONFIG_BUILD_TIMESTAMP=y
# CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 is not set
CONFIG_WLAN_FEATURE_FILS=y
# CONFIG_WLAN_FEATURE_OWE is not set
# CONFIG_WLAN_FEATURE_GMAC is not set
# CONFIG_WLAN_FEATURE_SAE is not set
CONFIG_QCACLD_FEATURE_METERING=y
CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
CONFIG_WLAN_FEATURE_11W=y
CONFIG_WLAN_FEATURE_LPSS=y
CONFIG_QCOM_VOWIFI_11R=y
CONFIG_QCACLD_FEATURE_NAN=y
CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
CONFIG_QCACLD_FEATURE_GREEN_AP=y
CONFIG_HELIUMPLUS=y
CONFIG_64BIT_PADDR=y
CONFIG_QCOM_TDLS=y
CONFIG_QCOM_LTE_COEX=y
CONFIG_MPC_UT_FRAMEWORK=y
CONFIG_WLAN_OFFLOAD_PACKETS=y
CONFIG_FEATURE_TSO=y
# CONFIG_FEATURE_TSO_DEBUG is not set
CONFIG_WLAN_FASTPATH=y
CONFIG_WLAN_NAPI=y
# CONFIG_WLAN_NAPI_DEBUG is not set
CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
CONFIG_WLAN_SYNC_TSF=y
CONFIG_LFR_SUBNET_DETECTION=y
CONFIG_MCC_TO_SCC_SWITCH=y
CONFIG_QCACLD_WLAN_LFR2=y
CONFIG_WLAN_FEATURE_DISA=y
CONFIG_ICMP_DISABLE_PS=y
CONFIG_BUILD_TIMESTAMP=y
# CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 is not set
CONFIG_WLAN_FEATURE_FILS=y
# CONFIG_WLAN_FEATURE_OWE is not set
# CONFIG_WLAN_FEATURE_GMAC is not set
# CONFIG_WLAN_FEATURE_SAE is not set
CONFIG_QCACLD_FEATURE_METERING=y
# CONFIG_QCA_CLD_DEBUG is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
Expand Down Expand Up @@ -5266,6 +5272,16 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
# CONFIG_DEFAULT_SECURITY_SMACK is not set
# CONFIG_DEFAULT_SECURITY_DAC is not set
CONFIG_DEFAULT_SECURITY="selinux"

#
# Kernel hardening options
#

#
# Memory initialization
#
CONFIG_INIT_STACK_NONE=y
# CONFIG_INIT_STACK_ALL is not set
CONFIG_CRYPTO=y

#
Expand Down Expand Up @@ -5435,6 +5451,7 @@ CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
# CONFIG_CRC_T10DIF is not set
Expand Down
Loading

0 comments on commit a58fed3

Please sign in to comment.