summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2020-11-27 12:54:31 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2020-11-28 04:44:22 +0000
commit732f2eeddb59f664421d42cec0161e77dbe1d86b (patch)
treeea475d6a2cd4638e946b0cd2b8133064c51c002b /Makefile
parent0386aa1781e2bb1d10807b518b013ddf5d3ca02d (diff)
downloadflashrom-732f2eeddb59f664421d42cec0161e77dbe1d86b.tar.gz
flashrom-732f2eeddb59f664421d42cec0161e77dbe1d86b.tar.bz2
flashrom-732f2eeddb59f664421d42cec0161e77dbe1d86b.zip
raiden_debug: Rename with '_DEBUG_SPI' suffix
Unfortantly raiden_debug was upstreamed with a misnaming of the CONFIG_ make param that introduces unnecessary divergence. Rename to 'CONFIG_RAIDEN_DEBUG_SPI' as-is downstream. Change-Id: I07c03647c329286bb223e4dae4665704e508db2c Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/48105 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Sam McNally <sammc@google.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
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