Felix Singer submitted this change.

View Change


Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
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 <felixsinger@posteo.net>
Change-Id: Ic0fe589ffdccede0fbf6360c2bebe58a36654f10
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66096
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68011
---
M Makefile
M programmer.h
2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e08a3f6..38fc1fc 100644
--- a/Makefile
+++ b/Makefile
@@ -735,12 +735,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 d22bc6b..ef5175d 100644
--- a/programmer.h
+++ b/programmer.h
@@ -622,7 +622,7 @@
#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_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)))
+#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

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

Gerrit-Project: flashrom
Gerrit-Branch: 1.1.x
Gerrit-Change-Id: Ic0fe589ffdccede0fbf6360c2bebe58a36654f10
Gerrit-Change-Number: 68011
Gerrit-PatchSet: 5
Gerrit-Owner: Felix Singer <felixsinger@posteo.net>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Felix Singer <felixsinger@posteo.net>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Thomas Heijligen <src@posteo.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged