openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

raiden_debug: Rename with '_DEBUG_SPI' suffix

Browse Source 
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>
This commit is contained in:
Edward O'Callaghan 2020-11-27 12:54:31 +11:00 committed by Edward O'Callaghan
parent 0386aa1781
commit 732f2eeddb
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -248,10 +248,10 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
else else
override CONFIG_RAYER_SPI = no override CONFIG_RAYER_SPI = no
endif endif
ifeq ($(CONFIG_RAIDEN), yes) ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes)
UNSUPPORTED_FEATURES += CONFIG_RAIDEN=yes UNSUPPORTED_FEATURES += CONFIG_RAIDEN_DEBUG_SPI=yes
else else
override CONFIG_RAIDEN = no override CONFIG_RAIDEN_DEBUG_SPI = no
endif endif
ifeq ($(CONFIG_NIC3COM), yes) ifeq ($(CONFIG_NIC3COM), yes)
UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes
@ -691,7 +691,7 @@ CONFIG_SERPROG ?= yes
CONFIG_RAYER_SPI ?= yes CONFIG_RAYER_SPI ?= yes
# ChromiumOS servo DUT debug board hardware support # ChromiumOS servo DUT debug board hardware support
CONFIG_RAIDEN ?= yes CONFIG_RAIDEN_DEBUG_SPI ?= yes
# PonyProg2000 SPI hardware support # PonyProg2000 SPI hardware support
CONFIG_PONY_SPI ?= yes CONFIG_PONY_SPI ?= yes
@ -820,7 +820,7 @@ override CONFIG_DEDIPROG = no
override CONFIG_DIGILENT_SPI = no override CONFIG_DIGILENT_SPI = no
override CONFIG_DEVELOPERBOX_SPI = no override CONFIG_DEVELOPERBOX_SPI = no
override CONFIG_PICKIT2_SPI = no override CONFIG_PICKIT2_SPI = no
override CONFIG_RAIDEN = no override CONFIG_RAIDEN_DEBUG_SPI = no
override CONFIG_STLINKV3_SPI = no override CONFIG_STLINKV3_SPI = no
endif endif
ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no)
@ -932,8 +932,8 @@ PROGRAMMER_OBJS += rayer_spi.o
NEED_RAW_ACCESS += CONFIG_RAYER_SPI NEED_RAW_ACCESS += CONFIG_RAYER_SPI
endif endif
ifeq ($(CONFIG_RAIDEN), yes) ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes)
FEATURE_CFLAGS += -D'CONFIG_RAIDEN=1' FEATURE_CFLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1'
PROGRAMMER_OBJS += raiden_debug_spi.o PROGRAMMER_OBJS += raiden_debug_spi.o
endif endif

2
flashrom.c
View File

@ -145,7 +145,7 @@ const struct programmer_entry programmer_table[] = {
}, },
#endif #endif
#if CONFIG_RAIDEN == 1 #if CONFIG_RAIDEN_DEBUG_SPI == 1
{ {
.name = "raiden_debug", .name = "raiden_debug",
.type = USB, .type = USB,

2
meson.build
View File

@ -179,7 +179,7 @@ if config_gfxnvidia
endif endif
if config_raiden if config_raiden
srcs += 'raiden_debug_spi.c' srcs += 'raiden_debug_spi.c'
cargs += '-DCONFIG_RAIDEN=1' cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
endif endif
if config_internal if config_internal
srcs += 'board_enable.c' srcs += 'board_enable.c'

4
programmer.h
View File

@ -46,7 +46,7 @@ enum programmer {
#if CONFIG_GFXNVIDIA == 1 #if CONFIG_GFXNVIDIA == 1
PROGRAMMER_GFXNVIDIA, PROGRAMMER_GFXNVIDIA,
#endif #endif
#if CONFIG_RAIDEN == 1 #if CONFIG_RAIDEN_DEBUG_SPI == 1
PROGRAMMER_RAIDEN, PROGRAMMER_RAIDEN,
#endif #endif
#if CONFIG_DRKAISER == 1 #if CONFIG_DRKAISER == 1
@ -417,7 +417,7 @@ extern const struct dev_entry gfx_nvidia[];
#endif #endif
/* raiden_debug_spi.c */ /* raiden_debug_spi.c */
#if CONFIG_RAIDEN == 1 #if CONFIG_RAIDEN_DEBUG_SPI == 1
int raiden_debug_spi_init(void); int raiden_debug_spi_init(void);
extern const struct dev_entry devs_raiden[]; extern const struct dev_entry devs_raiden[];
#endif #endif