diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-07-22 23:23:28 +0200 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-10-06 01:01:01 +0000 |
| commit | 919277fc689d4691b8d03526bbd363b080ec5612 (patch) | |
| tree | cec5190886cfcd54b0440fa1724c6d60f65351f9 | |
| parent | e8c548c850f68a0e58bc9c7c92313af5e248de8b (diff) | |
| download | flashrom-919277fc689d4691b8d03526bbd363b080ec5612.tar.gz flashrom-919277fc689d4691b8d03526bbd363b080ec5612.tar.bz2 flashrom-919277fc689d4691b8d03526bbd363b080ec5612.zip | |
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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | programmer.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -735,12 +735,16 @@ else 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 d22bc6b73..ef5175d2e 100644 --- a/programmer.h +++ b/programmer.h @@ -622,7 +622,7 @@ enum spi_controller { #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 |