Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, but someone else must approve Sam McNally: Looks good to me, approved
flashrom.c: Correct "raiden_debug_spi" drv name

Unfortunately raiden_debug was upstreamed with a slightly
incorrect name of "raiden_debug" whereas in ChromiumOS
it is known as "raiden_debug_spi" and so correct this to
align. This avoids confusion and divergence for a unified
future.

Change-Id: I0eca35863403c5d4adbe19b31801e8dfa072006f
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/48106
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sam McNally <sammc@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M flashrom.c
M programmer.h
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flashrom.c b/flashrom.c
index 630e7ea..7f5f2a8 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -147,7 +147,7 @@

#if CONFIG_RAIDEN_DEBUG_SPI == 1
{
- .name = "raiden_debug",
+ .name = "raiden_debug_spi",
.type = USB,
.devs.dev = devs_raiden,
.init = raiden_debug_spi_init,
diff --git a/programmer.h b/programmer.h
index c93bf83..d66d239 100644
--- a/programmer.h
+++ b/programmer.h
@@ -47,7 +47,7 @@
PROGRAMMER_GFXNVIDIA,
#endif
#if CONFIG_RAIDEN_DEBUG_SPI == 1
- PROGRAMMER_RAIDEN,
+ PROGRAMMER_RAIDEN_DEBUG_SPI,
#endif
#if CONFIG_DRKAISER == 1
PROGRAMMER_DRKAISER,

To view, visit change 48106. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I0eca35863403c5d4adbe19b31801e8dfa072006f
Gerrit-Change-Number: 48106
Gerrit-PatchSet: 4
Gerrit-Owner: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Sam McNally <sammc@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged