]>
Commit | Line | Data |
---|---|---|
7a009e4c JB |
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 | |
5 | ||
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> | |
12 | --- | |
13 | meson.build | 6 ++++++ | |
14 | meson_options.txt | 1 + | |
15 | 2 files changed, 7 insertions(+) | |
16 | ||
0a7b99a6 JB |
17 | --- flashrom-v1.2/meson.build.orig 2019-12-31 18:25:41.000000000 +0100 |
18 | +++ flashrom-v1.2/meson.build 2021-06-15 19:38:52.837851898 +0200 | |
19 | @@ -44,6 +44,7 @@ config_ft2232_spi = get_option('config_f | |
20 | config_gfxnvidia = get_option('config_gfxnvidia') | |
21 | config_internal = get_option('config_internal') | |
22 | config_it8212 = get_option('config_it8212') | |
7a009e4c | 23 | +config_jlink_spi = get_option('config_jlink_spi') |
0a7b99a6 JB |
24 | config_linux_mtd = get_option('config_linux_mtd') |
25 | config_linux_spi = get_option('config_linux_spi') | |
26 | config_mstarddc_spi = get_option('config_mstarddc_spi') | |
27 | @@ -152,6 +153,11 @@ if config_digilent_spi | |
7a009e4c JB |
28 | srcs += 'digilent_spi.c' |
29 | cargs += '-DCONFIG_DIGILENT_SPI=1' | |
30 | endif | |
31 | +if config_jlink_spi | |
32 | + srcs += 'jlink_spi.c' | |
33 | + cargs += '-DCONFIG_JLINK_SPI=1' | |
34 | + deps += dependency('libjaylink') | |
35 | +endif | |
36 | if config_drkaiser | |
37 | srcs += 'drkaiser.c' | |
38 | cargs += '-DCONFIG_DRKAISER=1' | |
0a7b99a6 JB |
39 | --- flashrom-v1.2/meson_options.txt.orig 2021-06-15 19:36:51.274905627 +0200 |
40 | +++ flashrom-v1.2/meson_options.txt 2021-06-15 19:39:11.555485464 +0200 | |
41 | @@ -16,6 +16,7 @@ option('config_gfxnvidia', type : 'boole | |
42 | option('config_internal', type : 'boolean', value : true, description : 'internal/onboard') | |
43 | option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser') | |
44 | option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA') | |
7a009e4c | 45 | +option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices') |
0a7b99a6 JB |
46 | option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces') |
47 | option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces') | |
48 | option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support') |