diff options
| author | Thomas Heijligen <thomas.heijligen@secunet.com> | 2022-04-27 10:16:04 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2022-04-29 10:21:14 +0000 |
| commit | cb7e627f11f98df20b5127a2040fef2ee87bc48c (patch) | |
| tree | 1a4c012d1e1ca8d81728719240a31572a4cd1610 | |
| parent | b899ab233fc3e49386bfa5b4f88901aafe4d066e (diff) | |
| download | flashrom-cb7e627f11f98df20b5127a2040fef2ee87bc48c.tar.gz flashrom-cb7e627f11f98df20b5127a2040fef2ee87bc48c.tar.bz2 flashrom-cb7e627f11f98df20b5127a2040fef2ee87bc48c.zip | |
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 <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/63886
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | Makefile | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -539,14 +539,6 @@ $(foreach var, $(filter CONFIG_%, $(.VARIABLES)),\ $(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 @@ FEATURE_FLAGS += -D'CONFIG_PONY_SPI=1' 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 @@ FEATURE_FLAGS += -D'CONFIG_NI845X_SPI=1' 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 |