diff --git a/Makefile b/Makefile
index 049862405..327d43bb2 100644
--- a/Makefile
+++ b/Makefile
@@ -248,10 +248,10 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
 else
 override CONFIG_RAYER_SPI = no
 endif
-ifeq ($(CONFIG_RAIDEN), yes)
-UNSUPPORTED_FEATURES += CONFIG_RAIDEN=yes
+ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes)
+UNSUPPORTED_FEATURES += CONFIG_RAIDEN_DEBUG_SPI=yes
 else
-override CONFIG_RAIDEN = no
+override CONFIG_RAIDEN_DEBUG_SPI = no
 endif
 ifeq ($(CONFIG_NIC3COM), yes)
 UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes
@@ -691,7 +691,7 @@ CONFIG_SERPROG ?= yes
 CONFIG_RAYER_SPI ?= yes
 
 # ChromiumOS servo DUT debug board hardware support
-CONFIG_RAIDEN ?= yes
+CONFIG_RAIDEN_DEBUG_SPI ?= yes
 
 # PonyProg2000 SPI hardware support
 CONFIG_PONY_SPI ?= yes
@@ -820,7 +820,7 @@ override CONFIG_DEDIPROG = no
 override CONFIG_DIGILENT_SPI = no
 override CONFIG_DEVELOPERBOX_SPI = no
 override CONFIG_PICKIT2_SPI = no
-override CONFIG_RAIDEN = no
+override CONFIG_RAIDEN_DEBUG_SPI = no
 override CONFIG_STLINKV3_SPI = no
 endif
 ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no)
@@ -932,8 +932,8 @@ PROGRAMMER_OBJS += rayer_spi.o
 NEED_RAW_ACCESS += CONFIG_RAYER_SPI
 endif
 
-ifeq ($(CONFIG_RAIDEN), yes)
-FEATURE_CFLAGS += -D'CONFIG_RAIDEN=1'
+ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes)
+FEATURE_CFLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1'
 PROGRAMMER_OBJS += raiden_debug_spi.o
 endif
 
diff --git a/flashrom.c b/flashrom.c
index 26e2df879..630e7ea79 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -145,7 +145,7 @@ const struct programmer_entry programmer_table[] = {
 	},
 #endif
 
-#if CONFIG_RAIDEN == 1
+#if CONFIG_RAIDEN_DEBUG_SPI == 1
 	{
 		.name			= "raiden_debug",
 		.type			= USB,
diff --git a/meson.build b/meson.build
index 8418d72cd..1acbdb35e 100644
--- a/meson.build
+++ b/meson.build
@@ -179,7 +179,7 @@ if config_gfxnvidia
 endif
 if config_raiden
   srcs += 'raiden_debug_spi.c'
-  cargs += '-DCONFIG_RAIDEN=1'
+  cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
 endif
 if config_internal
   srcs += 'board_enable.c'
diff --git a/programmer.h b/programmer.h
index ed30d89dc..c93bf839e 100644
--- a/programmer.h
+++ b/programmer.h
@@ -46,7 +46,7 @@ enum programmer {
 #if CONFIG_GFXNVIDIA == 1
 	PROGRAMMER_GFXNVIDIA,
 #endif
-#if CONFIG_RAIDEN == 1
+#if CONFIG_RAIDEN_DEBUG_SPI == 1
 	PROGRAMMER_RAIDEN,
 #endif
 #if CONFIG_DRKAISER == 1
@@ -417,7 +417,7 @@ extern const struct dev_entry gfx_nvidia[];
 #endif
 
 /* raiden_debug_spi.c */
-#if CONFIG_RAIDEN == 1
+#if CONFIG_RAIDEN_DEBUG_SPI == 1
 int raiden_debug_spi_init(void);
 extern const struct dev_entry devs_raiden[];
 #endif