summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Schink <dev@zapb.de>2020-12-08 22:20:50 +0100
committerEdward O'Callaghan <quasisec@chromium.org>2020-12-13 01:09:25 +0000
commit13a356815d2438103689a6ea1ac7e58d4d508ddb (patch)
tree1e2e2081a494d3feeb68e2f2d47848a6c7104bc1
parentf634a0dcc61ba0b972320c8a687268d0e02ac491 (diff)
downloadflashrom-13a356815d2438103689a6ea1ac7e58d4d508ddb.tar.gz
flashrom-13a356815d2438103689a6ea1ac7e58d4d508ddb.tar.bz2
flashrom-13a356815d2438103689a6ea1ac7e58d4d508ddb.zip
meson: Add missing config option for J-Link SPI
Signed-off-by: Marc Schink <dev@zapb.de> Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
-rw-r--r--meson.build6
-rw-r--r--meson_options.txt1
2 files changed, 7 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index fd5a5ef79..556183e5e 100644
--- a/meson.build
+++ b/meson.build
@@ -38,6 +38,7 @@ config_ch341a_spi = get_option('config_ch341a_spi')
config_dediprog = get_option('config_dediprog')
config_developerbox_spi = get_option('config_developerbox_spi')
config_digilent_spi = get_option('config_digilent_spi')
+config_jlink_spi = get_option('config_jlink_spi')
config_drkaiser = get_option('config_drkaiser')
config_dummy = get_option('config_dummy')
config_ene_lpc = get_option('config_ene_lpc')
@@ -159,6 +160,11 @@ if config_digilent_spi
srcs += 'digilent_spi.c'
cargs += '-DCONFIG_DIGILENT_SPI=1'
endif
+if config_jlink_spi
+ srcs += 'jlink_spi.c'
+ cargs += '-DCONFIG_JLINK_SPI=1'
+ deps += dependency('libjaylink')
+endif
if config_drkaiser
srcs += 'drkaiser.c'
cargs += '-DCONFIG_DRKAISER=1'
diff --git a/meson_options.txt b/meson_options.txt
index 9c0a7982e..89fcbee88 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,6 +9,7 @@ option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winch
option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100')
option('config_developerbox_spi', type : 'boolean', value : true, description : 'Developerbox emergency recovery')
option('config_digilent_spi', type : 'boolean', value : true, description : 'Digilent Development board JTAG')
+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices')
option('config_drkaiser', type : 'boolean', value : true, description : 'Dr. Kaiser')
option('config_dummy', type : 'boolean', value : true, description : 'dummy tracing')
option('config_ene_lpc', type : 'boolean', value : true, description : 'ENE LPC interface keyboard controller')