- rediffed meson-jlink patch

[packages/flashrom.git] / flashrom-meson-jlink.patch

From 13a356815d2438103689a6ea1ac7e58d4d508ddb Mon Sep 17 00:00:00 2001
From: Marc Schink <dev@zapb.de>
Date: Tue, 8 Dec 2020 22:20:50 +0100
Subject: [PATCH] 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>
---
 meson.build       | 6 ++++++
 meson_options.txt | 1 +
 2 files changed, 7 insertions(+)

--- flashrom-v1.2/meson.build.orig	2019-12-31 18:25:41.000000000 +0100
+++ flashrom-v1.2/meson.build	2021-06-15 19:38:52.837851898 +0200
@@ -44,6 +44,7 @@ config_ft2232_spi = get_option('config_f
 config_gfxnvidia = get_option('config_gfxnvidia')
 config_internal = get_option('config_internal')
 config_it8212 = get_option('config_it8212')
+config_jlink_spi = get_option('config_jlink_spi')
 config_linux_mtd = get_option('config_linux_mtd')
 config_linux_spi = get_option('config_linux_spi')
 config_mstarddc_spi = get_option('config_mstarddc_spi')
@@ -152,6 +153,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'
--- flashrom-v1.2/meson_options.txt.orig	2021-06-15 19:36:51.274905627 +0200
+++ flashrom-v1.2/meson_options.txt	2021-06-15 19:39:11.555485464 +0200
@@ -16,6 +16,7 @@ option('config_gfxnvidia', type : 'boole
 option('config_internal', type : 'boolean', value : true, description : 'internal/onboard')
 option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser')
 option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA')
+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible devices')
 option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces')
 option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces')
 option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support')