Martin L Roth has uploaded this change for review.

View Change

flashrom: rename sb600spi.c to amd_spi.c

The modern AMD platforms all use the code in sb600spi.c, but no longer
have any relationship to that name. This makes the name more generic and
easier to figure out what's in the file from the name.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I13859de27e602cc6496684e6cb66b2dc2e21531a
---
M MAINTAINERS
M Makefile
R amd_spi.c
M include/programmer.h
M meson.build
5 files changed, 19 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/52/74952/1

diff --git a/MAINTAINERS b/MAINTAINERS
index 0adc258..8ae44b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -128,10 +128,10 @@
 # PROGRAMMERS
 ################################################################################
 
-AMD SB600SPI
+AMD SPI
 M:	Arthur Heymans <arthur@aheymans.xyz>
 S:	Maintained
-F:	sb600spi.c
+F:	amd_spi.c
 
 CH347
 M:	Nicholas Chin <nic.c3.14@gmail.com>
diff --git a/Makefile b/Makefile
index 0e16942..2f8a8c1 100644
--- a/Makefile
+++ b/Makefile
@@ -590,7 +590,7 @@
 ifeq ($(CONFIG_INTERNAL) $(CONFIG_INTERNAL_X86), yes yes)
 FEATURE_FLAGS += -D'CONFIG_INTERNAL=1'
 PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o \
-	internal.o internal_par.o it87spi.o sb600spi.o superio.o amd_imc.o wbsio_spi.o mcp6x_spi.o \
+	internal.o internal_par.o it87spi.o amd_spi.o superio.o amd_imc.o wbsio_spi.o mcp6x_spi.o \
 	ichspi.o dmi.o known_boards.o
 ACTIVE_PROGRAMMERS += internal
 endif
diff --git a/sb600spi.c b/amd_spi.c
similarity index 100%
rename from sb600spi.c
rename to amd_spi.c
diff --git a/include/programmer.h b/include/programmer.h
index 5b304f5..82bbd61 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -395,7 +395,7 @@
 /* internal_par.c */
 void internal_par_init(enum chipbustype buses);
 
-/* sb600spi.c */
+/* amd_spi.c */
 int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev);
 
 /* wbsio_spi.c */
diff --git a/meson.build b/meson.build
index 2784c34..10cd74b 100644
--- a/meson.build
+++ b/meson.build
@@ -281,9 +281,9 @@
       'internal.c',
       'internal_par.c',
       'it87spi.c',
-      'sb600spi.c',
       'superio.c',
       'amd_imc.c',
+      'amd_spi.c',
       'wbsio_spi.c',
       'mcp6x_spi.c',
       'ichspi.c',

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