[flashrom-gerrit] Change in flashrom[master]: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63886 )

Change subject: Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs
......................................................................

Makefile: Align BITBANG_SPI with the other DEPENDS_ and USE_ configs

Drop not needed `-DCONFIG_BITBANG_SPI=1`

Change-Id: I2a519c929f7747af70568284823b51678751e285
Signed-off-by: Thomas Heijligen 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/63886
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M Makefile
1 file changed, 5 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/Makefile b/Makefile
index e4cfede..513ac82 100644
--- a/Makefile
+++ b/Makefile
@@ -539,14 +539,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.

@@ -616,11 +608,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
@@ -786,6 +773,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