diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-03-30 10:40:30 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2021-04-01 22:35:52 +0000 |
| commit | c193fbde8446d33178711a1c07ddc49882fa2b3a (patch) | |
| tree | 214b120d3b96a6f87710328e004db0bad10a8e11 | |
| parent | 2daeea2ac6ef54914f64c19b291ddbeacfc0820d (diff) | |
| download | flashrom-c193fbde8446d33178711a1c07ddc49882fa2b3a.tar.gz flashrom-c193fbde8446d33178711a1c07ddc49882fa2b3a.tar.bz2 flashrom-c193fbde8446d33178711a1c07ddc49882fa2b3a.zip | |
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>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 1 insertions, 6 deletions
@@ -248,11 +248,6 @@ UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes 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 5b339e06..db625414 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,7 @@ else 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 @@ else config_atavia = false config_drkaiser = false config_gfxnvidia = false - config_raiden_debug_spi = false config_internal = false config_it8212 = false config_nic3com = false |