Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ab1f67 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdm845: Enable Android base config options"

parents 84048a1e 0fa7fca9

arch/arm64/configs/sdm845-perf_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CONFIG_CPUSETS=y 
CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_BPF=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set
@@ -31,6 +32,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

# CONFIG_AIO is not set

# CONFIG_MEMBARRIER is not set

CONFIG_EMBEDDED=y
@@ -156,6 +158,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y 
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y
@@ -203,8 +206,6 @@ CONFIG_NET_SCH_MULTIQ=y 
CONFIG_NET_SCH_INGRESS=y

CONFIG_NET_CLS_FW=y

CONFIG_NET_CLS_U32=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_FLOW=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_CMP=y

CONFIG_NET_EMATCH_NBYTE=y
@@ -526,6 +527,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

arch/arm64/configs/sdm845_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ CONFIG_CPUSETS=y 
CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_BPF=y

CONFIG_SCHED_CORE_CTL=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set
@@ -35,6 +36,7 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

# CONFIG_AIO is not set

# CONFIG_MEMBARRIER is not set

CONFIG_EMBEDDED=y
@@ -162,9 +164,9 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y 
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -211,8 +213,6 @@ CONFIG_NET_SCH_MULTIQ=y 
CONFIG_NET_SCH_INGRESS=y

CONFIG_NET_CLS_FW=y

CONFIG_NET_CLS_U32=y

CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_FLOW=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_CMP=y

CONFIG_NET_EMATCH_NBYTE=y
@@ -552,6 +552,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y