Edward O'Callaghan submitted this change.

View Change

Makefile,meson.build: Fix dependency issues with raiden_debug_spi

The Raiden debug external spi programmer need only depend
on libusb and is unrelated to libpci. Correct meson and gnu make
builds where meson had configuration in the incorrect section
and gnu make artifactually disabled the build on Windows/MinGW
which doesn't have libpci.

BUG=none
TEST=still continues to build.

Change-Id: I2d6a8c33a2228abf006a9b278bcb7133765c7074
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51930
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M Makefile
M meson.build
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 6d37d55..0cfff55 100644
--- a/Makefile
+++ b/Makefile
@@ -248,11 +248,6 @@
 else
 override CONFIG_RAYER_SPI = no
 endif
-ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes)
-UNSUPPORTED_FEATURES += CONFIG_RAIDEN_DEBUG_SPI=yes
-else
-override CONFIG_RAIDEN_DEBUG_SPI = no
-endif
 ifeq ($(CONFIG_NIC3COM), yes)
 UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes
 else
diff --git a/meson.build b/meson.build
index 5b339e0..db62541 100644
--- a/meson.build
+++ b/meson.build
@@ -99,6 +99,7 @@
   config_digilent_spi = false
   config_developerbox_spi = false
   config_pickit2_spi = false
+  config_raiden_debug_spi = false
 endif
 
 # some programmers require libpci
@@ -113,7 +114,6 @@
   config_atavia = false
   config_drkaiser = false
   config_gfxnvidia = false
-  config_raiden_debug_spi = false
   config_internal = false
   config_it8212 = false
   config_nic3com = false

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