Thomas Heijligen has uploaded this change for review.

View Change

Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs

Drop not needed `-DCONDIG_BITBANG_SPI=1`

Change-Id: I2a519c929f7747af70568284823b51678751e285
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
---
M Makefile
1 file changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/63886/1

diff --git a/Makefile b/Makefile
index 26c77d9..5dc8528 100644
--- a/Makefile
+++ b/Makefile
@@ -537,14 +537,6 @@
 		$(eval $(var)=yes)))
 endif
 
-# Bitbanging SPI infrastructure, default off unless needed.
-
-ifneq ($(call filter_deps,$(DEPENDS_ON_BITBANG_SPI)), )
-override CONFIG_BITBANG_SPI = yes
-else
-CONFIG_BITBANG_SPI ?= no
-endif
-
 ###############################################################################
 # Handle CONFIG_* variables that depend on others set (and verified) above.
 
@@ -614,11 +606,6 @@
 PROGRAMMER_OBJS += pony_spi.o
 endif
 
-ifeq ($(CONFIG_BITBANG_SPI), yes)
-FEATURE_FLAGS += -D'CONFIG_BITBANG_SPI=1'
-PROGRAMMER_OBJS += bitbang_spi.o
-endif
-
 ifeq ($(CONFIG_NIC3COM), yes)
 FEATURE_FLAGS += -D'CONFIG_NIC3COM=1'
 PROGRAMMER_OBJS += nic3com.o
@@ -784,6 +771,11 @@
 PROGRAMMER_OBJS += ni845x_spi.o
 endif
 
+USE_BITBANG_SPI := $(if $(call filter_deps,$(DEPENDS_ON_BITBANG_SPI)),yes,no)
+ifeq ($(USE_BITBANG_SPI), yes)
+LIB_OBJS += bitbang_spi.o
+endif
+
 USE_LINUX_I2C := $(if $(call filter_deps,$(DEPENDS_ON_LINUX_I2C)),yes,no)
 ifeq ($(USE_LINUX_I2C), yes)
 LIB_OBJS += i2c_helper_linux.o

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