Skip to content

Commit 71a2bae

Browse files
kelsey-steelechessturo
authored andcommitted
configs: update 6.6 configs for WSL2
Add x86 and ARM64 configs used by WSL2. Several are required to be built in for WSL2 to boot. Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
1 parent 6c3aecf commit 71a2bae

2 files changed

Lines changed: 106 additions & 86 deletions

File tree

arch/arm64/configs/config-wsl-arm64

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ CONFIG_ARCH_USE_GNU_PROPERTY=y
10221022
CONFIG_ELFCORE=y
10231023
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
10241024
CONFIG_BINFMT_SCRIPT=y
1025-
CONFIG_BINFMT_MISC=m
1025+
CONFIG_BINFMT_MISC=y
10261026
CONFIG_COREDUMP=y
10271027
# end of Executable file formats
10281028

@@ -1203,7 +1203,7 @@ CONFIG_IP_ROUTE_CLASSID=y
12031203
# CONFIG_IP_PNP is not set
12041204
CONFIG_NET_IPIP=m
12051205
CONFIG_NET_IPGRE_DEMUX=m
1206-
CONFIG_NET_IP_TUNNEL=m
1206+
CONFIG_NET_IP_TUNNEL=y
12071207
CONFIG_NET_IPGRE=m
12081208
CONFIG_NET_IPGRE_BROADCAST=y
12091209
CONFIG_IP_MROUTE_COMMON=y
@@ -1213,7 +1213,7 @@ CONFIG_IP_PIMSM_V1=y
12131213
CONFIG_IP_PIMSM_V2=y
12141214
CONFIG_SYN_COOKIES=y
12151215
CONFIG_NET_IPVTI=m
1216-
CONFIG_NET_UDP_TUNNEL=m
1216+
CONFIG_NET_UDP_TUNNEL=y
12171217
CONFIG_NET_FOU=m
12181218
CONFIG_NET_FOU_IP_TUNNELS=y
12191219
CONFIG_INET_AH=m
@@ -1224,9 +1224,9 @@ CONFIG_INET_IPCOMP=m
12241224
CONFIG_INET_TABLE_PERTURB_ORDER=16
12251225
CONFIG_INET_XFRM_TUNNEL=m
12261226
CONFIG_INET_TUNNEL=m
1227-
CONFIG_INET_DIAG=m
1228-
CONFIG_INET_TCP_DIAG=m
1229-
CONFIG_INET_UDP_DIAG=m
1227+
CONFIG_INET_DIAG=y
1228+
CONFIG_INET_TCP_DIAG=y
1229+
CONFIG_INET_UDP_DIAG=y
12301230
# CONFIG_INET_RAW_DIAG is not set
12311231
# CONFIG_INET_DIAG_DESTROY is not set
12321232
CONFIG_TCP_CONG_ADVANCED=y
@@ -1296,16 +1296,16 @@ CONFIG_BRIDGE_NETFILTER=m
12961296
CONFIG_NETFILTER_INGRESS=y
12971297
CONFIG_NETFILTER_EGRESS=y
12981298
CONFIG_NETFILTER_SKIP_EGRESS=y
1299-
CONFIG_NETFILTER_NETLINK=m
1299+
CONFIG_NETFILTER_NETLINK=y
13001300
CONFIG_NETFILTER_FAMILY_BRIDGE=y
13011301
CONFIG_NETFILTER_FAMILY_ARP=y
13021302
CONFIG_NETFILTER_BPF_LINK=y
13031303
# CONFIG_NETFILTER_NETLINK_HOOK is not set
13041304
CONFIG_NETFILTER_NETLINK_ACCT=m
13051305
CONFIG_NETFILTER_NETLINK_QUEUE=m
1306-
CONFIG_NETFILTER_NETLINK_LOG=m
1306+
CONFIG_NETFILTER_NETLINK_LOG=y
13071307
CONFIG_NETFILTER_NETLINK_OSF=m
1308-
CONFIG_NF_CONNTRACK=m
1308+
CONFIG_NF_CONNTRACK=y
13091309
CONFIG_NF_LOG_SYSLOG=m
13101310
CONFIG_NETFILTER_CONNCOUNT=m
13111311
CONFIG_NF_CONNTRACK_MARK=y
@@ -1336,7 +1336,7 @@ CONFIG_NF_CT_NETLINK=m
13361336
CONFIG_NF_CT_NETLINK_TIMEOUT=m
13371337
# CONFIG_NF_CT_NETLINK_HELPER is not set
13381338
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
1339-
CONFIG_NF_NAT=m
1339+
CONFIG_NF_NAT=y
13401340
CONFIG_NF_NAT_AMANDA=m
13411341
CONFIG_NF_NAT_FTP=m
13421342
CONFIG_NF_NAT_IRC=m
@@ -1346,7 +1346,7 @@ CONFIG_NF_NAT_REDIRECT=y
13461346
CONFIG_NF_NAT_MASQUERADE=y
13471347
CONFIG_NF_NAT_OVS=y
13481348
CONFIG_NETFILTER_SYNPROXY=m
1349-
CONFIG_NF_TABLES=m
1349+
CONFIG_NF_TABLES=y
13501350
CONFIG_NF_TABLES_INET=y
13511351
CONFIG_NF_TABLES_NETDEV=y
13521352
CONFIG_NFT_NUMGEN=m
@@ -1355,9 +1355,9 @@ CONFIG_NFT_FLOW_OFFLOAD=m
13551355
CONFIG_NFT_CONNLIMIT=m
13561356
CONFIG_NFT_LOG=m
13571357
CONFIG_NFT_LIMIT=m
1358-
CONFIG_NFT_MASQ=m
1358+
CONFIG_NFT_MASQ=y
13591359
CONFIG_NFT_REDIR=m
1360-
CONFIG_NFT_NAT=m
1360+
CONFIG_NFT_NAT=y
13611361
CONFIG_NFT_TUNNEL=m
13621362
CONFIG_NFT_QUEUE=m
13631363
CONFIG_NFT_QUOTA=m
@@ -1543,7 +1543,7 @@ CONFIG_IP_VS_PE_SIP=m
15431543
#
15441544
# IP: Netfilter Configuration
15451545
#
1546-
CONFIG_NF_DEFRAG_IPV4=m
1546+
CONFIG_NF_DEFRAG_IPV4=y
15471547
CONFIG_NF_SOCKET_IPV4=m
15481548
CONFIG_NF_TPROXY_IPV4=m
15491549
CONFIG_NF_TABLES_IPV4=y
@@ -1615,7 +1615,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
16151615
CONFIG_IP6_NF_TARGET_NPT=m
16161616
# end of IPv6: Netfilter Configuration
16171617

1618-
CONFIG_NF_DEFRAG_IPV6=m
1618+
CONFIG_NF_DEFRAG_IPV6=y
16191619
CONFIG_NF_TABLES_BRIDGE=m
16201620
CONFIG_NFT_BRIDGE_META=m
16211621
CONFIG_NFT_BRIDGE_REJECT=m
@@ -1836,13 +1836,13 @@ CONFIG_OPENVSWITCH=m
18361836
CONFIG_OPENVSWITCH_GRE=m
18371837
CONFIG_OPENVSWITCH_VXLAN=m
18381838
CONFIG_OPENVSWITCH_GENEVE=m
1839-
CONFIG_VSOCKETS=m
1839+
CONFIG_VSOCKETS=y
18401840
CONFIG_VSOCKETS_DIAG=m
18411841
CONFIG_VSOCKETS_LOOPBACK=m
18421842
CONFIG_VIRTIO_VSOCKETS=m
18431843
CONFIG_VIRTIO_VSOCKETS_COMMON=m
1844-
CONFIG_HYPERV_VSOCKETS=m
1845-
CONFIG_NETLINK_DIAG=m
1844+
CONFIG_HYPERV_VSOCKETS=y
1845+
CONFIG_NETLINK_DIAG=y
18461846
CONFIG_MPLS=y
18471847
CONFIG_NET_MPLS_GSO=m
18481848
CONFIG_MPLS_ROUTING=m
@@ -2014,9 +2014,9 @@ CONFIG_RFKILL=y
20142014
CONFIG_RFKILL_LEDS=y
20152015
CONFIG_RFKILL_INPUT=y
20162016
CONFIG_RFKILL_GPIO=m
2017-
CONFIG_NET_9P=m
2018-
CONFIG_NET_9P_FD=m
2019-
CONFIG_NET_9P_VIRTIO=m
2017+
CONFIG_NET_9P=y
2018+
CONFIG_NET_9P_FD=y
2019+
CONFIG_NET_9P_VIRTIO=y
20202020
CONFIG_NET_9P_XEN=m
20212021
CONFIG_NET_9P_RDMA=m
20222022
# CONFIG_NET_9P_DEBUG is not set
@@ -2081,7 +2081,7 @@ CONFIG_PCI_PRI=y
20812081
CONFIG_PCI_PASID=y
20822082
# CONFIG_PCI_P2PDMA is not set
20832083
CONFIG_PCI_LABEL=y
2084-
CONFIG_PCI_HYPERV=m
2084+
CONFIG_PCI_HYPERV=y
20852085
# CONFIG_PCI_DYNAMIC_OF_NODES is not set
20862086
# CONFIG_PCIE_BUS_TUNE_OFF is not set
20872087
CONFIG_PCIE_BUS_DEFAULT=y
@@ -2115,7 +2115,7 @@ CONFIG_PCI_HOST_GENERIC=y
21152115
CONFIG_PCIE_MEDIATEK=y
21162116
# CONFIG_PCIE_MEDIATEK_GEN3 is not set
21172117
# CONFIG_PCIE_MICROCHIP_HOST is not set
2118-
CONFIG_PCI_HYPERV_INTERFACE=m
2118+
CONFIG_PCI_HYPERV_INTERFACE=y
21192119
# CONFIG_PCI_TEGRA is not set
21202120
CONFIG_PCIE_RCAR_HOST=y
21212121
# CONFIG_PCIE_RCAR_EP is not set
@@ -2817,7 +2817,7 @@ CONFIG_SCSI_HPTIOP=m
28172817
# CONFIG_SCSI_MYRB is not set
28182818
# CONFIG_SCSI_MYRS is not set
28192819
CONFIG_XEN_SCSI_FRONTEND=m
2820-
CONFIG_HYPERV_STORAGE=m
2820+
CONFIG_HYPERV_STORAGE=y
28212821
CONFIG_LIBFC=m
28222822
CONFIG_LIBFCOE=m
28232823
CONFIG_FCOE=m
@@ -3061,7 +3061,7 @@ CONFIG_MACVTAP=m
30613061
CONFIG_IPVLAN_L3S=y
30623062
CONFIG_IPVLAN=m
30633063
# CONFIG_IPVTAP is not set
3064-
CONFIG_VXLAN=m
3064+
CONFIG_VXLAN=y
30653065
CONFIG_GENEVE=m
30663066
# CONFIG_BAREUDP is not set
30673067
# CONFIG_GTP is not set
@@ -4119,7 +4119,7 @@ CONFIG_XEN_NETDEV_FRONTEND=y
41194119
CONFIG_XEN_NETDEV_BACKEND=m
41204120
CONFIG_VMXNET3=m
41214121
CONFIG_FUJITSU_ES=m
4122-
CONFIG_HYPERV_NET=m
4122+
CONFIG_HYPERV_NET=y
41234123
CONFIG_NETDEVSIM=m
41244124
CONFIG_NET_FAILOVER=y
41254125
CONFIG_ISDN=y
@@ -4303,7 +4303,7 @@ CONFIG_SERIO_ALTERA_PS2=m
43034303
CONFIG_SERIO_PS2MULT=m
43044304
CONFIG_SERIO_ARC_PS2=m
43054305
CONFIG_SERIO_APBPS2=m
4306-
CONFIG_HYPERV_KEYBOARD=m
4306+
CONFIG_HYPERV_KEYBOARD=y
43074307
# CONFIG_SERIO_SUN4I_PS2 is not set
43084308
CONFIG_SERIO_GPIO_PS2=m
43094309
CONFIG_USERIO=m
@@ -4432,7 +4432,7 @@ CONFIG_SERIAL_DEV_BUS=y
44324432
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
44334433
CONFIG_TTY_PRINTK=y
44344434
CONFIG_TTY_PRINTK_LEVEL=6
4435-
CONFIG_VIRTIO_CONSOLE=m
4435+
CONFIG_VIRTIO_CONSOLE=y
44364436
CONFIG_IPMI_HANDLER=m
44374437
CONFIG_IPMI_DMI_DECODE=y
44384438
CONFIG_IPMI_PLAT_DATA=y
@@ -7744,7 +7744,7 @@ CONFIG_USB_SERIAL_GENERIC=y
77447744
# CONFIG_USB_SERIAL_AIRCABLE is not set
77457745
# CONFIG_USB_SERIAL_ARK3116 is not set
77467746
# CONFIG_USB_SERIAL_BELKIN is not set
7747-
# CONFIG_USB_SERIAL_CH341 is not set
7747+
CONFIG_USB_SERIAL_CH341=m
77487748
# CONFIG_USB_SERIAL_WHITEHEAT is not set
77497749
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
77507750
CONFIG_USB_SERIAL_CP210X=m
@@ -8461,10 +8461,11 @@ CONFIG_VHOST_VSOCK=m
84618461
#
84628462
# Microsoft Hyper-V guest support
84638463
#
8464-
CONFIG_HYPERV=m
8465-
CONFIG_HYPERV_UTILS=m
8466-
CONFIG_HYPERV_BALLOON=m
8467-
# CONFIG_DXGKRNL is not set
8464+
CONFIG_HYPERV=y
8465+
CONFIG_HYPERV_TIMER=y
8466+
CONFIG_HYPERV_UTILS=y
8467+
CONFIG_HYPERV_BALLOON=y
8468+
CONFIG_DXGKRNL=y
84688469
# end of Microsoft Hyper-V guest support
84698470

84708471
#
@@ -10088,11 +10089,11 @@ CONFIG_QUOTA_TREE=m
1008810089
CONFIG_QFMT_V2=m
1008910090
CONFIG_QUOTACTL=y
1009010091
CONFIG_AUTOFS_FS=y
10091-
CONFIG_FUSE_FS=m
10092+
CONFIG_FUSE_FS=y
1009210093
CONFIG_CUSE=m
10093-
CONFIG_VIRTIO_FS=m
10094+
CONFIG_VIRTIO_FS=y
1009410095
CONFIG_FUSE_DAX=y
10095-
CONFIG_OVERLAY_FS=m
10096+
CONFIG_OVERLAY_FS=y
1009610097
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
1009710098
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
1009810099
# CONFIG_OVERLAY_FS_INDEX is not set
@@ -10103,9 +10104,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
1010310104
#
1010410105
# Caches
1010510106
#
10106-
CONFIG_NETFS_SUPPORT=m
10107+
CONFIG_NETFS_SUPPORT=y
1010710108
# CONFIG_NETFS_STATS is not set
10108-
CONFIG_FSCACHE=m
10109+
CONFIG_FSCACHE=y
1010910110
# CONFIG_FSCACHE_STATS is not set
1011010111
# CONFIG_FSCACHE_DEBUG is not set
1011110112
# CONFIG_CACHEFILES is not set
@@ -10210,7 +10211,15 @@ CONFIG_PSTORE_COMPRESS=y
1021010211
# CONFIG_PSTORE_BLK is not set
1021110212
# CONFIG_SYSV_FS is not set
1021210213
# CONFIG_UFS_FS is not set
10213-
# CONFIG_EROFS_FS is not set
10214+
CONFIG_EROFS_FS=m
10215+
# CONFIG_EROFS_FS_DEBUG is not set
10216+
CONFIG_EROFS_FS_XATTR=y
10217+
CONFIG_EROFS_FS_POSIX_ACL=y
10218+
CONFIG_EROFS_FS_SECURITY=y
10219+
CONFIG_EROFS_FS_ZIP=y
10220+
# CONFIG_EROFS_FS_ZIP_LZMA is not set
10221+
# CONFIG_EROFS_FS_ZIP_DEFLATE is not set
10222+
# CONFIG_EROFS_FS_PCPU_KTHREAD is not set
1021410223
CONFIG_NETWORK_FILESYSTEMS=y
1021510224
CONFIG_NFS_FS=m
1021610225
CONFIG_NFS_V2=m
@@ -10276,8 +10285,8 @@ CONFIG_CIFS_DFS_UPCALL=y
1027610285
CONFIG_SMBFS=m
1027710286
# CONFIG_CODA_FS is not set
1027810287
# CONFIG_AFS_FS is not set
10279-
CONFIG_9P_FS=m
10280-
# CONFIG_9P_FSCACHE is not set
10288+
CONFIG_9P_FS=y
10289+
CONFIG_9P_FSCACHE=y
1028110290
CONFIG_9P_FS_POSIX_ACL=y
1028210291
CONFIG_9P_FS_SECURITY=y
1028310292
CONFIG_NLS=y

0 commit comments

Comments
 (0)