- rediffed meson-jlink patch

diff --git a/flashrom-meson-jlink.patch b/flashrom-meson-jlink.patch
index e63700409920d7203ee2b044cfc269b511554305..27c68bbc836e6270563fe997c485ca1ade07ec24 100644 (file)
--- a/flashrom-meson-jlink.patch
+++ b/flashrom-meson-jlink.patch
@@ -14,19 +14,17 @@ Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
  meson_options.txt | 1 +
  2 files changed, 7 insertions(+)
 
-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')
+--- 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_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
+ 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
@@ -38,15 +36,13 @@ index fd5a5ef79..556183e5e 100644
  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')
+--- 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_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')
+ 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')