[flashrom-gerrit] [M] Change in flashrom[1.2.x]: Makefile: Fix dependencies for developerbox_spi

[Felix Singer (Code Review)]

Attention is currently required from: Thomas Heijligen, Angel Pons.

Hello build bot (Jenkins), Thomas Heijligen, Angel Pons,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/flashrom/+/68064

to review the following change.

Change subject: Makefile: Fix dependencies for developerbox_spi
......................................................................

Makefile: Fix dependencies for developerbox_spi

Note: This patch was backported from the master branch and it was
modified so that it can be applied on the 1.1.x branch.

The developerbox_spi programmer depends on bitbang SPI support. Thus,
fix that.

Signed-off-by: Felix Singer 
Change-Id: Ic0fe589ffdccede0fbf6360c2bebe58a36654f10
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66096
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Thomas Heijligen 
---
M Makefile
M programmer.h
2 files changed, 82 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/64/68064/1

diff --git a/Makefile b/Makefile
index 52a2f95..0cea6b7 100644
--- a/Makefile
+++ b/Makefile
@@ -763,12 +763,16 @@
 ifeq ($(CONFIG_OGP_SPI), yes)
 override CONFIG_BITBANG_SPI = yes
 else
+ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes)
+override CONFIG_BITBANG_SPI = yes
+else
 CONFIG_BITBANG_SPI ?= no
 endif
 endif
 endif
 endif
 endif
+endif

###############################################################################
 # Handle CONFIG_* variables that depend on others set (and verified) above.
diff --git a/programmer.h b/programmer.h
index 3cf53b9..75cadeb 100644
--- a/programmer.h
+++ b/programmer.h
@@ -588,6 +588,64 @@
 char *extract_programmer_param(const char *param_name);

/* spi.c */
+enum spi_controller {
+	SPI_CONTROLLER_NONE,
+#if CONFIG_INTERNAL == 1
+#if defined(__i386__) || defined(__x86_64__)
+	SPI_CONTROLLER_ICH7,
+	SPI_CONTROLLER_ICH9,
+	SPI_CONTROLLER_IT85XX,
+	SPI_CONTROLLER_IT87XX,
+	SPI_CONTROLLER_SB600,
+	SPI_CONTROLLER_YANGTZE,
+	SPI_CONTROLLER_VIA,
+	SPI_CONTROLLER_WBSIO,
+#endif
+#endif
+#if CONFIG_FT2232_SPI == 1
+	SPI_CONTROLLER_FT2232,
+#endif
+#if CONFIG_DUMMY == 1
+	SPI_CONTROLLER_DUMMY,
+#endif
+#if CONFIG_BUSPIRATE_SPI == 1
+	SPI_CONTROLLER_BUSPIRATE,
+#endif
+#if CONFIG_DEDIPROG == 1
+	SPI_CONTROLLER_DEDIPROG,
+#endif
+#if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || CONFIG_PONY_SPI == 1 || CONFIG_DEVELOPERBOX_SPI == 1 || (CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)))
+	SPI_CONTROLLER_BITBANG,
+#endif
+#if CONFIG_LINUX_MTD == 1
+	SPI_CONTROLLER_LINUX_MTD,
+#endif
+#if CONFIG_LINUX_SPI == 1
+	SPI_CONTROLLER_LINUX,
+#endif
+#if CONFIG_SERPROG == 1
+	SPI_CONTROLLER_SERPROG,
+#endif
+#if CONFIG_USBBLASTER_SPI == 1
+	SPI_CONTROLLER_USBBLASTER,
+#endif
+#if CONFIG_MSTARDDC_SPI == 1
+	SPI_CONTROLLER_MSTARDDC,
+#endif
+#if CONFIG_PICKIT2_SPI == 1
+	SPI_CONTROLLER_PICKIT2,
+#endif
+#if CONFIG_CH341A_SPI == 1
+	SPI_CONTROLLER_CH341A_SPI,
+#endif
+#if CONFIG_DIGILENT_SPI == 1
+	SPI_CONTROLLER_DIGILENT_SPI,
+#endif
+#if CONFIG_JLINK_SPI == 1
+	SPI_CONTROLLER_JLINK_SPI,
+#endif
+};
+
 #define MAX_DATA_UNSPECIFIED 0
 #define MAX_DATA_READ_UNLIMITED 64 * 1024
 #define MAX_DATA_WRITE_UNLIMITED 256