From 919277fc689d4691b8d03526bbd363b080ec5612 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 22 Jul 2022 23:23:28 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/68011 --- Makefile | 4 ++++ programmer.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e08a3f608..38fc1fccf 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3