From be46e43b2a5d6f1fd5b4076cf350cc73d015f4fe Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Sun, 27 Jun 2021 14:34:16 +0200
Subject: Makefile: Enable bitbang_spi based on its dependency list

Change-Id: I2a22667cfe14e4c5816b3bce13de632941690d17
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55880
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 Makefile | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8f99dc04..41481725 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,12 @@ $(foreach p,$1, \
 		$(eval override $(p) := no)))
 endef
 
+define filter_deps
+$(strip $(foreach p,$1, \
+	$(if $(filter $($(p)),yes), \
+		$(p))))
+endef
+
 define disable_all
 $(foreach p,$1, \
 	$(eval override $(p) := no))
@@ -479,27 +485,12 @@ $(foreach var, $(filter CONFIG_%, $(.VARIABLES)),\
 endif
 
 # Bitbanging SPI infrastructure, default off unless needed.
-ifeq ($(CONFIG_RAYER_SPI), yes)
-override CONFIG_BITBANG_SPI = yes
-else
-ifeq ($(CONFIG_PONY_SPI), yes)
-override CONFIG_BITBANG_SPI = yes
-else
-ifeq ($(CONFIG_INTERNAL), yes)
-override CONFIG_BITBANG_SPI = yes
-else
-ifeq ($(CONFIG_NICINTEL_SPI), yes)
-override CONFIG_BITBANG_SPI = yes
-else
-ifeq ($(CONFIG_OGP_SPI), yes)
+
+ifneq ($(call filter_deps,$(DEPENDS_ON_BITBANG_SPI)), )
 override CONFIG_BITBANG_SPI = yes
 else
 CONFIG_BITBANG_SPI ?= no
 endif
-endif
-endif
-endif
-endif
 
 ###############################################################################
 # Handle CONFIG_* variables that depend on others set (and verified) above.
-- 
cgit v1.2.3