Change in flashrom[master]: meson: Add missing config option for J-Link SPI

zapb has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/48478 ) Change subject: meson: Add missing config option for J-Link SPI ...................................................................... meson: Add missing config option for J-Link SPI Signed-off-by: Marc Schink <dev@zapb.de> Change-Id: I476c649f9db7342688560aac9ee5df056517a028 --- M meson.build M meson_options.txt 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/48478/1 diff --git a/meson.build b/meson.build index fd5a5ef..556183e 100644 --- a/meson.build +++ b/meson.build @@ -38,6 +38,7 @@ 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 @@ 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 9c0a798..89fcbee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,6 +9,7 @@ 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') -- To view, visit https://review.coreboot.org/c/flashrom/+/48478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Gerrit-Change-Number: 48478 Gerrit-PatchSet: 1 Gerrit-Owner: zapb <dev@zapb.de> Gerrit-MessageType: newchange

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/48478 ) Change subject: meson: Add missing config option for J-Link SPI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/48478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Gerrit-Change-Number: 48478 Gerrit-PatchSet: 1 Gerrit-Owner: zapb <dev@zapb.de> Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-CC: Mario Limonciello <superm1@gmail.com> Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net> Gerrit-Comment-Date: Sat, 12 Dec 2020 10:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/48478 ) Change subject: meson: Add missing config option for J-Link SPI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/48478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Gerrit-Change-Number: 48478 Gerrit-PatchSet: 1 Gerrit-Owner: zapb <dev@zapb.de> Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-CC: Mario Limonciello <superm1@gmail.com> Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net> Gerrit-Comment-Date: Sun, 13 Dec 2020 01:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/48478 ) Change subject: meson: Add missing config option for J-Link SPI ...................................................................... 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> --- M meson.build M meson_options.txt 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/meson.build b/meson.build index fd5a5ef..556183e 100644 --- a/meson.build +++ b/meson.build @@ -38,6 +38,7 @@ 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 @@ 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 9c0a798..89fcbee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,6 +9,7 @@ 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') -- To view, visit https://review.coreboot.org/c/flashrom/+/48478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I476c649f9db7342688560aac9ee5df056517a028 Gerrit-Change-Number: 48478 Gerrit-PatchSet: 2 Gerrit-Owner: zapb <dev@zapb.de> Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-CC: Mario Limonciello <superm1@gmail.com> Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net> Gerrit-MessageType: merged
participants (3)
-
Angel Pons (Code Review)
-
Edward O'Callaghan (Code Review)
-
zapb (Code Review)