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

Commit 58cdf136 authored by Alistair Strachan's avatar Alistair Strachan
Browse files

ANDROID: Update x86_64_cuttlefish_defconfig 



Merge with the configs from kernel/configs.git added recently.

This should fix ipsec VPN functionality.

Bug: 80540078
Change-Id: I9cc99f5e34d2809670fe2fc0df121610657f6769
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent a56900fa

arch/x86/configs/x86_64_cuttlefish_defconfig

+10 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y
@@ -60,6 +61,7 @@ CONFIG_RANDOMIZE_BASE=y 
CONFIG_PHYSICAL_ALIGN=0x1000000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0 reboot=p nopti"

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -92,8 +94,8 @@ CONFIG_IP_MROUTE=y 
CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_TCP_CONG_ADVANCED=y
@@ -108,6 +110,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y
@@ -137,6 +140,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=y 
CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_BPF=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -311,11 +315,11 @@ CONFIG_MEDIA_SUPPORT=y 
CONFIG_DRM=y

# CONFIG_DRM_FBDEV_EMULATION is not set

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_HIDRAW=y

CONFIG_UHID=y

# CONFIG_HID_GENERIC is not set

CONFIG_HID_A4TECH=y

CONFIG_HID_ACRUX=y

CONFIG_HID_ACRUX_FF=y
@@ -379,6 +383,8 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_DUMMY_HCD=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y
@@ -436,11 +442,11 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_PANIC_TIMEOUT=5

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_UPROBE_EVENT=y

CONFIG_IO_DELAY_NONE=y

CONFIG_DEBUG_BOOT_PARAMS=y

CONFIG_OPTIMIZE_INLINING=y
@@ -452,3 +458,4 @@ CONFIG_HARDENED_USERCOPY=y 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_SHA512=y