diff --git a/Makefile b/Makefile
index dd19e1415..b8b40ca60 100644
--- a/Makefile
+++ b/Makefile
@@ -212,16 +212,6 @@ UNSUPPORTED_FEATURES += CONFIG_STLINKV3_SPI=yes
 else
 override CONFIG_STLINKV3_SPI = no
 endif
-ifeq ($(CONFIG_LSPCON_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_LSPCON_I2C_SPI=yes
-else
-override CONFIG_LSPCON_I2C_SPI = no
-endif
-ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_REALTEK_MST_I2C_SPI=yes
-else
-override CONFIG_REALTEK_MST_I2C_SPI = no
-endif
 # libjaylink is also not available for DOS
 ifeq ($(CONFIG_JLINK_SPI), yes)
 UNSUPPORTED_FEATURES += CONFIG_JLINK_SPI=yes
@@ -338,16 +328,6 @@ UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes
 else
 override CONFIG_SATAMV = no
 endif
-ifeq ($(CONFIG_LSPCON_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_LSPCON_I2C_SPI=yes
-else
-override CONFIG_LSPCON_I2C_SPI = no
-endif
-ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_REALTEK_MST_I2C_SPI=yes
-else
-override CONFIG_REALTEK_MST_I2C_SPI = no
-endif
 endif
 
 ifneq ($(TARGET_OS), MinGW)
@@ -433,16 +413,6 @@ UNSUPPORTED_FEATURES += CONFIG_STLINKV3_SPI=yes
 else
 override CONFIG_STLINKV3_SPI = no
 endif
-ifeq ($(CONFIG_LSPCON_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_LSPCON_I2C_SPI=yes
-else
-override CONFIG_LSPCON_I2C_SPI = no
-endif
-ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_REALTEK_MST_I2C_SPI=yes
-else
-override CONFIG_REALTEK_MST_I2C_SPI = no
-endif
 ifeq ($(CONFIG_CH341A_SPI), yes)
 UNSUPPORTED_FEATURES += CONFIG_CH341A_SPI=yes
 else
@@ -467,6 +437,16 @@ ifeq ($(CONFIG_MSTARDDC_SPI), yes)
 UNSUPPORTED_FEATURES += CONFIG_MSTARDDC_SPI=yes
 else
 override CONFIG_MSTARDDC_SPI = no
+ifeq ($(CONFIG_LSPCON_I2C_SPI), yes)
+UNSUPPORTED_FEATURES += CONFIG_LSPCON_I2C_SPI=yes
+else
+override CONFIG_LSPCON_I2C_SPI = no
+endif
+ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes)
+UNSUPPORTED_FEATURES += CONFIG_REALTEK_MST_I2C_SPI=yes
+else
+override CONFIG_REALTEK_MST_I2C_SPI = no
+endif
 endif
 endif
 endif