diff --git a/target/linux/meson/image/Makefile b/target/linux/meson/image/Makefile
index 0aaf55fa5..0b5883afa 100644
--- a/target/linux/meson/image/Makefile
+++ b/target/linux/meson/image/Makefile
@@ -99,15 +99,13 @@ ifeq ($(SUBTARGET),mesongx)
   TARGET_DEVICES += gxl-s905x-p212
 endif
 
-define Device/khadas-vim1
-  DEVICE_DTS := amlogic/meson-gxl-s905x-khadas-vim
-  DEVICE_PACKAGES += \
-	cypress-firmware-43455-sdio \
-	kmod-brcmfmac wpad-basic
-  DEVICE_TITLE := Khadas VIM1 Development Board
+define Device/gxm-q200
+  DEVICE_DTS := amlogic/meson-gxm-q200
+  DEVICE_PACKAGES +=
+  DEVICE_TITLE := GXM Q200 Development Board
 endef
 ifeq ($(SUBTARGET),mesongx)
-  TARGET_DEVICES += khadas-vim1
+  TARGET_DEVICES += gxm-q200
 endif
 
 define Device/thunder-onecloud
diff --git a/target/linux/meson/meson8b/config-5.10 b/target/linux/meson/meson8b/config-5.10
index 8480f7a30..612450f82 100644
--- a/target/linux/meson/meson8b/config-5.10
+++ b/target/linux/meson/meson8b/config-5.10
@@ -435,7 +435,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
-CONFIG_TUN=y
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/target/linux/meson/mesongx/config-5.10 b/target/linux/meson/mesongx/config-5.10
index b1838a2c5..6023a2b49 100644
--- a/target/linux/meson/mesongx/config-5.10
+++ b/target/linux/meson/mesongx/config-5.10
@@ -1,5 +1,6 @@
 CONFIG_64BIT=y
 # CONFIG_AIO is not set
+CONFIG_AMLOGIC_THERMAL=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_MESON=y
@@ -51,7 +52,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_SCMI_PROTOCOL is not set
+CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ASN1=y
@@ -66,6 +67,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_PM=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
+CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 # CONFIG_CEC_CH7322 is not set
 # CONFIG_CEC_MESON_AO is not set
 # CONFIG_CEC_MESON_G12A_AO is not set
@@ -104,34 +106,37 @@ CONFIG_COMMON_CLK_XGENE=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_COREDUMP=y
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_THERMAL=y
 CONFIG_CPU_RMAP=y
+CONFIG_CPU_THERMAL=y
 CONFIG_CRC16=y
 CONFIG_CRC7=y
 CONFIG_CRC_ITU_T=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
@@ -140,7 +145,6 @@ CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_INFO=y
 CONFIG_DMA_CMA=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_REMAP=y
@@ -238,7 +242,6 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HDMI=y
-CONFIG_HISILICON_ERRATUM_161010101=y
 # CONFIG_HIST_TRIGGERS is not set
 CONFIG_HOLES_IN_ZONE=y
 CONFIG_HWMON=y
@@ -275,8 +278,8 @@ CONFIG_KEYS=y
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 CONFIG_LEDS_GPIO=y
 CONFIG_LIBFDT=y
+CONFIG_LIB_MEMNEQ=y
 # CONFIG_LIRC is not set
-CONFIG_LLD_VERSION=0
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_MAGIC_SYSRQ=y
@@ -395,6 +398,7 @@ CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_PM_OPP=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POWER_RESET=y
@@ -419,9 +423,9 @@ CONFIG_REALTEK_PHY=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_PWM=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_MESON=y
 # CONFIG_RESET_MESON_AUDIO_ARB is not set
@@ -429,9 +433,9 @@ CONFIG_RFS_ACCEL=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_SCSI=y
 CONFIG_SDIO_UART=y
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 CONFIG_SENSORS_ARM_SCPI=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_MCTRL_GPIO=y
@@ -459,16 +463,20 @@ CONFIG_SWIOTLB=y
 CONFIG_SWPHY=y
 CONFIG_SYNC_FILE=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
-CONFIG_TUN=y
+# CONFIG_UCLAMP_TASK is not set
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y