1 From 13a356815d2438103689a6ea1ac7e58d4d508ddb Mon Sep 17 00:00:00 2001
2 From: Marc Schink <dev@zapb.de>
3 Date: Tue, 8 Dec 2020 22:20:50 +0100
4 Subject: [PATCH] meson: Add missing config option for J-Link SPI
6 Signed-off-by: Marc Schink <dev@zapb.de>
7 Change-Id: I476c649f9db7342688560aac9ee5df056517a028
8 Reviewed-on: https://review.coreboot.org/c/flashrom/+/48478
9 Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
10 Reviewed-by: Angel Pons <th3fanbus@gmail.com>
11 Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
13 meson.build | 6 ++++++
14 meson_options.txt | 1 +
15 2 files changed, 7 insertions(+)
17 diff --git a/meson.build b/meson.build
18 index fd5a5ef79..556183e5e 100644
21 @@ -38,6 +38,7 @@ config_ch341a_spi = get_option('config_ch341a_spi')
22 config_dediprog = get_option('config_dediprog')
23 config_developerbox_spi = get_option('config_developerbox_spi')
24 config_digilent_spi = get_option('config_digilent_spi')
25 +config_jlink_spi = get_option('config_jlink_spi')
26 config_drkaiser = get_option('config_drkaiser')
27 config_dummy = get_option('config_dummy')
28 config_ene_lpc = get_option('config_ene_lpc')
29 @@ -159,6 +160,11 @@ if config_digilent_spi
30 srcs += 'digilent_spi.c'
31 cargs += '-DCONFIG_DIGILENT_SPI=1'
34 + srcs += 'jlink_spi.c'
35 + cargs += '-DCONFIG_JLINK_SPI=1'
36 + deps += dependency('libjaylink')
40 cargs += '-DCONFIG_DRKAISER=1'
41 diff --git a/meson_options.txt b/meson_options.txt
42 index 9c0a7982e..89fcbee88 100644
43 --- a/meson_options.txt
44 +++ b/meson_options.txt
45 @@ -9,6 +9,7 @@ option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winch
46 option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100')
47 option('config_developerbox_spi', type : 'boolean', value : true, description : 'Developerbox emergency recovery')
48 option('config_digilent_spi', type : 'boolean', value : true, description : 'Digilent Development board JTAG')
49 +option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices')
50 option('config_drkaiser', type : 'boolean', value : true, description : 'Dr. Kaiser')
51 option('config_dummy', type : 'boolean', value : true, description : 'dummy tracing')
52 option('config_ene_lpc', type : 'boolean', value : true, description : 'ENE LPC interface keyboard controller')