Skip to content

Commit 1b31262

Browse files
committed
fix: bring configs up to date
1 parent 266391c commit 1b31262

11 files changed

Lines changed: 1414 additions & 692 deletions

File tree

config/amd64/config

Lines changed: 94 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,21 @@ CONFIG_X86_VSYSCALL_EMULATION=y
1717
CONFIG_NUMA=y
1818
CONFIG_AMD_NUMA=y
1919
CONFIG_X86_64_ACPI_NUMA=y
20-
CONFIG_NUMA_EMU=y
2120
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
2221
CONFIG_X86_SGX=y
22+
CONFIG_X86_USER_SHADOW_STACK=y
2323
CONFIG_EFI_MIXED=y
2424
CONFIG_RANDOMIZE_MEMORY=y
25+
CONFIG_ADDRESS_MASKING=y
2526
## choice: vsyscall table for legacy applications
2627
CONFIG_LEGACY_VSYSCALL_NONE=y
2728
## end choice
28-
CONFIG_SLS=y
29+
CONFIG_MITIGATION_SLS=y
2930
CONFIG_PCI_MMCONFIG=y
3031
CONFIG_ISA_DMA_API=y
3132
CONFIG_X86_X32_ABI=y
3233
CONFIG_X86_X32_DISABLED=y
3334

34-
##
35-
## file: arch/x86/Kconfig.cpu
36-
##
37-
## choice: Processor family
38-
# CONFIG_MK8 is not set
39-
# CONFIG_MPSC is not set
40-
# CONFIG_MCORE2 is not set
41-
# CONFIG_MATOM is not set
42-
CONFIG_GENERIC_CPU=y
43-
## end choice
44-
4535
##
4636
## file: arch/x86/crypto/Kconfig
4737
##
@@ -58,16 +48,15 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
5848
CONFIG_CRYPTO_TWOFISH_X86_64=m
5949
CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
6050
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
61-
CONFIG_CRYPTO_CHACHA20_X86_64=m
6251
CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
6352
CONFIG_CRYPTO_NHPOLY1305_SSE2=m
6453
CONFIG_CRYPTO_NHPOLY1305_AVX2=m
65-
CONFIG_CRYPTO_POLY1305_X86_64=m
66-
CONFIG_CRYPTO_SHA1_SSSE3=m
67-
CONFIG_CRYPTO_SHA256_SSSE3=m
68-
CONFIG_CRYPTO_SHA512_SSSE3=m
6954
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
70-
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
55+
56+
##
57+
## file: arch/x86/kvm/Kconfig
58+
##
59+
CONFIG_KVM_XEN=y
7160

7261
##
7362
## file: arch/x86/ras/Kconfig
@@ -84,6 +73,26 @@ CONFIG_XEN_512GB=y
8473
##
8574
CONFIG_SIGNED_PE_FILE_VERIFICATION=y
8675

76+
##
77+
## file: drivers/accel/Kconfig
78+
##
79+
CONFIG_DRM_ACCEL=y
80+
81+
##
82+
## file: drivers/accel/amdxdna/Kconfig
83+
##
84+
CONFIG_DRM_ACCEL_AMDXDNA=m
85+
86+
##
87+
## file: drivers/accel/habanalabs/Kconfig
88+
##
89+
CONFIG_DRM_ACCEL_HABANALABS=m
90+
91+
##
92+
## file: drivers/accel/ivpu/Kconfig
93+
##
94+
CONFIG_DRM_ACCEL_IVPU=m
95+
8796
##
8897
## file: drivers/acpi/Kconfig
8998
##
@@ -101,6 +110,11 @@ CONFIG_AGP=y
101110
#. Needed by GART_IOMMU
102111
CONFIG_AGP_AMD64=y
103112

113+
##
114+
## file: drivers/crypto/intel/iaa/Kconfig
115+
##
116+
CONFIG_CRYPTO_DEV_IAA_CRYPTO=m
117+
104118
##
105119
## file: drivers/cxl/Kconfig
106120
##
@@ -119,6 +133,11 @@ CONFIG_INTEL_IDXD_PERFMON=y
119133
CONFIG_EDAC_SBRIDGE=m
120134
CONFIG_EDAC_IGEN6=m
121135

136+
##
137+
## file: drivers/gpu/drm/amd/amdkfd/Kconfig
138+
##
139+
CONFIG_HSA_AMD_SVM=y
140+
122141
##
123142
## file: drivers/gpu/drm/i915/Kconfig
124143
##
@@ -151,6 +170,11 @@ CONFIG_STM_SOURCE_FTRACE=m
151170
##
152171
CONFIG_I2C_STUB=m
153172

173+
##
174+
## file: drivers/infiniband/hw/mana/Kconfig
175+
##
176+
CONFIG_MANA_INFINIBAND=m
177+
154178
##
155179
## file: drivers/input/mouse/Kconfig
156180
##
@@ -159,19 +183,27 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
159183
CONFIG_MOUSE_PS2_LIFEBOOK=y
160184
CONFIG_MOUSE_PS2_TRACKPOINT=y
161185

186+
##
187+
## file: drivers/iommu/Kconfig
188+
##
189+
CONFIG_VIRTIO_IOMMU=m
190+
162191
##
163192
## file: drivers/iommu/amd/Kconfig
164193
##
165194
CONFIG_AMD_IOMMU=y
166-
#. Can be built as a module, but nothing will trigger loading
167-
CONFIG_AMD_IOMMU_V2=y
168195

169196
##
170197
## file: drivers/macintosh/Kconfig
171198
##
172199
CONFIG_MACINTOSH_DRIVERS=y
173200
CONFIG_MAC_EMUMOUSEBTN=y
174201

202+
##
203+
## file: drivers/misc/Kconfig
204+
##
205+
CONFIG_NSM=m
206+
175207
##
176208
## file: drivers/net/Kconfig
177209
##
@@ -188,6 +220,11 @@ CONFIG_AMD_XGBE=m
188220
CONFIG_NET_VENDOR_GOOGLE=y
189221
CONFIG_GVE=m
190222

223+
##
224+
## file: drivers/net/ethernet/intel/idpf/Kconfig
225+
##
226+
CONFIG_IDPF=m
227+
191228
##
192229
## file: drivers/net/ethernet/microsoft/Kconfig
193230
##
@@ -207,18 +244,29 @@ CONFIG_NVDIMM_PFN=y
207244
##
208245
## file: drivers/pci/Kconfig
209246
##
247+
CONFIG_PCI_P2PDMA=y
210248
CONFIG_PCI_HYPERV=y
211249

212250
##
213251
## file: drivers/pinctrl/Kconfig
214252
##
215253
CONFIG_PINCTRL_AMD=y
216254

255+
##
256+
## file: drivers/platform/x86/Kconfig
257+
##
258+
CONFIG_SAMSUNG_GALAXYBOOK=m
259+
217260
##
218261
## file: drivers/platform/x86/amd/pmc/Kconfig
219262
##
220263
CONFIG_AMD_PMC=m
221264

265+
##
266+
## file: drivers/platform/x86/amd/pmf/Kconfig
267+
##
268+
CONFIG_AMD_PMF=m
269+
222270
##
223271
## file: drivers/platform/x86/intel/Kconfig
224272
##
@@ -248,6 +296,17 @@ CONFIG_SCSI_INIA100=m
248296
## file: drivers/spi/Kconfig
249297
##
250298
CONFIG_SPI_PXA2XX=m
299+
CONFIG_SPI_AMD=m
300+
301+
##
302+
## file: drivers/tee/Kconfig
303+
##
304+
CONFIG_TEE=m
305+
306+
##
307+
## file: drivers/tee/amdtee/Kconfig
308+
##
309+
CONFIG_AMDTEE=m
251310

252311
##
253312
## file: drivers/tty/Kconfig
@@ -267,6 +326,11 @@ CONFIG_FB_MATROX_MAVEN=m
267326
##
268327
CONFIG_TDX_GUEST_DRIVER=m
269328

329+
##
330+
## file: drivers/virt/nitro_enclaves/Kconfig
331+
##
332+
CONFIG_NITRO_ENCLAVES=m
333+
270334
##
271335
## file: drivers/virtio/Kconfig
272336
##
@@ -289,18 +353,10 @@ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
289353
##
290354
CONFIG_LIVEPATCH=y
291355

292-
##
293-
## file: kernel/rcu/Kconfig
294-
##
295-
CONFIG_RCU_FANOUT=64
296-
297356
##
298357
## file: lib/Kconfig.debug
299358
##
300359
CONFIG_DEBUG_INFO_BTF=y
301-
#. Workaround module loading of different builds of on-disk modules
302-
#. vs booted kernel when keeping same ABI, cf. #1003210, #1022202
303-
CONFIG_MODULE_ALLOW_BTF_MISMATCH=y
304360
CONFIG_FRAME_WARN=2048
305361

306362
##
@@ -309,9 +365,7 @@ CONFIG_FRAME_WARN=2048
309365
## choice: Memory model
310366
CONFIG_SPARSEMEM_MANUAL=y
311367
## end choice
312-
CONFIG_SPARSEMEM_VMEMMAP=y
313-
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
314-
CONFIG_ZONE_DEVICE=y
368+
CONFIG_NUMA_EMU=y
315369

316370
##
317371
## file: security/Kconfig
@@ -324,3 +378,11 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
324378
CONFIG_SND_SOC_AMD_ACP3x=m
325379
CONFIG_SND_SOC_AMD_RENOIR=m
326380
CONFIG_SND_SOC_AMD_RENOIR_MACH=m
381+
382+
##
383+
## file: sound/soc/amd/acp/Kconfig
384+
##
385+
CONFIG_SND_SOC_AMD_ACP_PCI=m
386+
CONFIG_SND_AMD_ASOC_RENOIR=m
387+
CONFIG_SND_AMD_ASOC_ACP70=m
388+
CONFIG_SND_SOC_AMD_LEGACY_MACH=m

config/amd64/config.cloud-amd64

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# CONFIG_X86_MCE is not set
1212
# CONFIG_X86_16BIT is not set
1313
# CONFIG_AMD_NUMA is not set
14-
# CONFIG_NUMA_EMU is not set
1514
# CONFIG_ISA_DMA_API is not set
1615
# CONFIG_ISA is not set
1716
# CONFIG_X86_X32_ABI is not set
@@ -32,6 +31,11 @@ CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
3231
##
3332
# CONFIG_I8K is not set
3433

34+
##
35+
## file: drivers/idle/Kconfig
36+
##
37+
CONFIG_INTEL_IDLE=y
38+
3539
##
3640
## file: drivers/infiniband/hw/usnic/Kconfig
3741
##
@@ -48,7 +52,18 @@ CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
4852
# CONFIG_DCDBAS is not set
4953
# CONFIG_DELL_RBU is not set
5054

55+
##
56+
## file: drivers/virt/vboxguest/Kconfig
57+
##
58+
# CONFIG_VBOXGUEST is not set
59+
5160
##
5261
## file: drivers/watchdog/Kconfig
5362
##
63+
CONFIG_I6300ESB_WDT=m
5464
# CONFIG_PCIPCWATCHDOG is not set
65+
66+
##
67+
## file: mm/Kconfig
68+
##
69+
# CONFIG_NUMA_EMU is not set

0 commit comments

Comments
 (0)