diff --git a/target/linux/armsr/armv8/config-6.18 b/target/linux/armsr/armv8/config-6.18
index 1a2138ad074..51483f7bb29 100644
--- a/target/linux/armsr/armv8/config-6.18
+++ b/target/linux/armsr/armv8/config-6.18
@@ -282,11 +282,7 @@ CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SUN6I=y
 CONFIG_DPAA2_CONSOLE=y
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
 # CONFIG_DRM_FSL_LDB is not set
-CONFIG_DRM_GEM_SHMEM_HELPER=y
 # CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE is not set
 # CONFIG_DRM_IMX8MP_HDMI_PVI is not set
@@ -299,18 +295,8 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y
 # CONFIG_DRM_IMX93_MIPI_DSI is not set
 # CONFIG_DRM_IMX_DCSS is not set
 # CONFIG_DRM_IMX_LCDC is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_QXL=y
 # CONFIG_DRM_RCAR_DU is not set
-# CONFIG_DRM_RZG2L_MIPI_DSI is not set
 # CONFIG_DRM_SHMOBILE is not set
-# CONFIG_DRM_SOLOMON_SSD2825 is not set
-# CONFIG_DRM_TI_TDP158 is not set
-CONFIG_DRM_TTM=y
-CONFIG_DRM_TTM_HELPER=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_DRM_VIRTIO_GPU_KMS=y
-CONFIG_DRM_VRAM_HELPER=y
 # CONFIG_DWMAC_SUN8I is not set
 # CONFIG_DWMAC_SUNXI is not set
 CONFIG_DW_WATCHDOG=y
@@ -319,15 +305,7 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_FB=y
-CONFIG_FB_ARMCLCD=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
 CONFIG_FB_HYPERV=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_MX3=y
 # CONFIG_FB_SH_MOBILE_LCDC is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_FEC is not set
diff --git a/target/linux/armsr/config-6.18 b/target/linux/armsr/config-6.18
index ba2923267b6..5abc5953d6e 100644
--- a/target/linux/armsr/config-6.18
+++ b/target/linux/armsr/config-6.18
@@ -107,12 +107,23 @@ CONFIG_DMA_REMAP=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
+CONFIG_DRM=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_TTM=y
+CONFIG_DRM_TTM_HELPER=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU_KMS=y
+CONFIG_DRM_VRAM_HELPER=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EFI=y
@@ -136,7 +147,14 @@ CONFIG_EFI_STUB=y
 CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
+CONFIG_FB=y
+CONFIG_FB_ARMCLCD=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CMDLINE=y
 CONFIG_FB_EFI=y
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FONT_8x16=y