diff --git a/target/linux/armvirt/32/config-5.15 b/target/linux/armvirt/32/config-5.15
index 8d7fc18050bfb4..d420850ad8a389 100644
--- a/target/linux/armvirt/32/config-5.15
+++ b/target/linux/armvirt/32/config-5.15
@@ -44,9 +44,7 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_DMA_OPS=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
 CONFIG_GENERIC_VDSO_32=y
-CONFIG_GPIO_CDEV=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HAVE_SMP=y
 CONFIG_HZ_FIXED=0
@@ -61,12 +59,9 @@ CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_RTC_MC146818_LIB=y
-CONFIG_SCSI_COMMON=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SMP_ON_UP=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
@@ -74,7 +69,6 @@ CONFIG_UNWINDER_ARM=y
 CONFIG_USE_OF=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZBOOT_ROM_BSS=0
diff --git a/target/linux/armvirt/64/config-5.15 b/target/linux/armvirt/64/config-5.15
index a5fc4d38a5fc43..5818dcaf704b29 100644
--- a/target/linux/armvirt/64/config-5.15
+++ b/target/linux/armvirt/64/config-5.15
@@ -96,8 +96,6 @@ CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_HDMI=y
@@ -130,16 +128,13 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_SCSI_COMMON=y
 CONFIG_SMC91X=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
@@ -151,6 +146,5 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
-CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VMAP_STACK=y
 CONFIG_ZONE_DMA32=y
diff --git a/target/linux/armvirt/config-5.15 b/target/linux/armvirt/config-5.15
index 8a9cdde6433c87..667efdf70b4a35 100644
--- a/target/linux/armvirt/config-5.15
+++ b/target/linux/armvirt/config-5.15
@@ -55,6 +55,7 @@ CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -65,6 +66,7 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
+CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_PL061=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -115,6 +117,7 @@ CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_RATIONAL=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
@@ -122,6 +125,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=y
 CONFIG_SCSI_VIRTIO=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_AMBA_PL011=y
@@ -129,6 +133,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SG_POOL=y
 CONFIG_SMP=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SRCU=y
 CONFIG_SWIOTLB=y
@@ -147,4 +152,5 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_XPS=y