March 2023 - flashrom-gerrit - mail.coreboot.org

[L] Change in flashrom[master]: doc: Add build instructions
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Stefan Reinauer, Anastasia Klimchuk, Peter Marheine. Hello build bot (Jenkins), Anastasia Klimchuk, Peter Marheine, Alexander Goncharov, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/73359 to look at the new patch set (#3). Change subject: doc: Add build instructions ...................................................................... doc: Add build instructions Those build instructions are mostly based on `Documentation/building.md` and the wiki. The `.. todo::` sections are non essential parts that will complete or improve the documentation. Either the content is not yet there or the sphinx-plugins to generate or improve them musst be first written. Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- D Documentation/building.md M doc/conf.py A doc/developers_doc/building_from_source.rst A doc/developers_doc/index.rst M doc/index.rst 5 files changed, 277 insertions(+), 148 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/59/73359/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/73359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Gerrit-Change-Number: 73359 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: doc: Add build instructions
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Stefan Reinauer, Anastasia Klimchuk, Peter Marheine. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73359 ) Change subject: doc: Add build instructions ...................................................................... Patch Set 2: (5 comments) Patchset: PS2: Sorry for moving the file. This hits the comments File doc/building_from_source.rst: https://review.coreboot.org/c/flashrom/+/73359/comment/be29ed4a_7ce9fa9e PS1, Line 32: build > If this is a builddir (I think it is), then let's name it builddir. […] Done https://review.coreboot.org/c/flashrom/+/73359/comment/530722cc_64b5f42c PS1, Line 174: ross > ross -> cross (typo) Done https://review.coreboot.org/c/flashrom/+/73359/comment/ee143836_8c98b338 PS1, Line 192: If you are not happy with the initial configuration, e.g. a programmer is missing, : or you want to review it > If you want to change your initial configuration for some reason (for example you discovered that a […] I've updated the description and there was also the <builddir> missing. https://review.coreboot.org/c/flashrom/+/73359/comment/dfe4d714_a1bf81f8 PS1, Line 206: To get a code coverage report > For coverage report: let's keep the existing instructions, please! They more detailed, written recen […] Ack -- To view, visit https://review.coreboot.org/c/flashrom/+/73359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Gerrit-Change-Number: 73359 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 03 Mar 2023 20:39:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: cli_classic: include a fallback inplementation of getopt
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Edward O'Callaghan, Angel Pons. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73102 ) Change subject: cli_classic: include a fallback inplementation of getopt ...................................................................... Patch Set 4: (2 comments) Patchset: PS1: > Not really. I just copied and tested it. […] Better now? File cli_getopt.c: https://review.coreboot.org/c/flashrom/+/73102/comment/977620c2_50b43c74 PS1, Line 13: #if 0 > I'm not yet sure how exactly handle this. I don't want to use the msg_** form flash.h. […] For now I've used flashroms message system. We can replace this along with the rest when it's time. -- To view, visit https://review.coreboot.org/c/flashrom/+/73102 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6ebbde075014e3b45b0f9e04b34b72aa969e1197 Gerrit-Change-Number: 73102 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 03 Mar 2023 20:32:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: meson_cross: Introduce meson cross file for DJGPP/DOS
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73439 ) Change subject: meson_cross: Introduce meson cross file for DJGPP/DOS ...................................................................... meson_cross: Introduce meson cross file for DJGPP/DOS With `meson setup --cross-file meson_cross/i586_djgpp_dos.txt builddir` you can build flashrom as DOS executable. Change-Id: Iabda73942c1e64cd46604c78533982374f78e1a4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- A meson_cross/i586_djgpp_dos.txt 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/73439/1 diff --git a/meson_cross/i586_djgpp_dos.txt b/meson_cross/i586_djgpp_dos.txt new file mode 100644 index 0000000..66d5ed0 --- /dev/null +++ b/meson_cross/i586_djgpp_dos.txt @@ -0,0 +1,29 @@ +# This file is for cross compiling flashrom for DOS with DJGPP. +# +# Make sure the program names match your toolchain +# +# Make sure pkg-config can find your self compiles libpci +# or add the path of your libpci.pc as 'pkg_config_libdir' +# under [properies] below. + +[binaries] +c = 'i586-pc-msdosdjgpp-gcc' +ar = 'i586-pc-msdosdjgpp-ar' +strip = 'i586-pc-msdosdjgpp-strip' +pkgconfig = 'pkg-config' + +[host_machine] +system = 'dos' +cpu_family = 'x86' +cpu = 'i586' +endian = 'little' + +[built-in options] +c_std = 'gnu99' +default_library = 'static' + +[project options] +tests = 'disabled' +ich_descriptors_tool = 'disabled' + +[properties] -- To view, visit https://review.coreboot.org/c/flashrom/+/73439 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iabda73942c1e64cd46604c78533982374f78e1a4 Gerrit-Change-Number: 73439 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

[L] Change in flashrom[master]: cli_classic: include a fallback inplementation of getopt
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Edward O'Callaghan, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/73102 to look at the new patch set (#4). Change subject: cli_classic: include a fallback inplementation of getopt ...................................................................... cli_classic: include a fallback inplementation of getopt Some systems [0] may not provide getopt and their gnu extensions. So provide a fallback implementation. This is based on musl libc's code. [0] DJGPP/DOS Change-Id: I6ebbde075014e3b45b0f9e04b34b72aa969e1197 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M cli_classic.c A cli_getopt.c A include/cli_classic.h M meson.build 4 files changed, 324 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/02/73102/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/73102 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6ebbde075014e3b45b0f9e04b34b72aa969e1197 Gerrit-Change-Number: 73102 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: doc: Add build instructions
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Thomas Heijligen, Stefan Reinauer, Peter Marheine. Hello build bot (Jenkins), Anastasia Klimchuk, Peter Marheine, Alexander Goncharov, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/73359 to look at the new patch set (#2). Change subject: doc: Add build instructions ...................................................................... doc: Add build instructions Those build instructions are mostly based on `Documentation/building.md` and the wiki. The `.. todo::` sections are non essential parts that will complete or improve the documentation. Either the content is not yet there or the sphinx-plugins to generate or improve them musst be first written. Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- D Documentation/building.md M doc/conf.py A doc/developers_doc/building_from_source.rst A doc/developers_doc/index.rst M doc/index.rst 5 files changed, 276 insertions(+), 148 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/59/73359/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Gerrit-Change-Number: 73359 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: meson.build: Use library() to build libflashrom
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Attention is currently required from: Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/73101 to look at the new patch set (#3). Change subject: meson.build: Use library() to build libflashrom ...................................................................... meson.build: Use library() to build libflashrom Use library() instead of both_libraries() to build libflashrom. The built-in option `default-library` can be used to decide which kind of libraries should be built. Make `both` the default and throw an error in the case someone tries to build the classic_cli with a shared library. Change-Id: I27f10fdf1227795a9a3b4e050a2d708b58f10ee7 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M meson.build 1 file changed, 27 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/01/73101/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/73101 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I27f10fdf1227795a9a3b4e050a2d708b58f10ee7 Gerrit-Change-Number: 73101 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: meson: fix typo "documtation" -> "documentation"
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73394 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: meson: fix typo "documtation" -> "documentation" ...................................................................... meson: fix typo "documtation" -> "documentation" When building with -Ddocumentation=enabled/disabled this typo terminates meson because meson can't find the misspellt option. Change-Id: Ia4205b89fd0d7e77ecbcd29392187d8911dd1049 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73394 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Elyes Haouas <ehaouas(a)noos.fr> --- M doc/meson.build 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Elyes Haouas: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/doc/meson.build b/doc/meson.build index 8826e33..70c3280 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -22,7 +22,7 @@ ) endif - if get_option('documentation').auto() or get_option('documtation').enabled() + if get_option('documentation').auto() or get_option('documentation').enabled() custom_target( 'documentation', command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'], -- To view, visit https://review.coreboot.org/c/flashrom/+/73394 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia4205b89fd0d7e77ecbcd29392187d8911dd1049 Gerrit-Change-Number: 73394 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: meson: revert to meson version 0.53.0
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73361 ) Change subject: meson: revert to meson version 0.53.0 ...................................................................... meson: revert to meson version 0.53.0 Debian Bullseye, current stable release, ships only with meson 0.56.2. To go back to an older meson version pass the project_version info as parameter to `sphinx-build` instead of using an environment variable. This is done by overriding the `release` variable in conf.py with `-Drelease=meson.project_version()` at the command line call. Change-Id: Iff9b8307c741a247a652cf666935c9485fa493fa Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73361 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M doc/conf.py M doc/meson.build M meson.build 3 files changed, 24 insertions(+), 6 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved Alexander Goncharov: Looks good to me, but someone else must approve diff --git a/doc/conf.py b/doc/conf.py index d06f538..79d8aae 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,7 +11,6 @@ project = 'flashrom' # copyright = '2023, The flashrom authors' author = 'The flashrom authors' -release = os.getenv('FLASHROM_VERSION') # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-confi… diff --git a/doc/meson.build b/doc/meson.build index bdf4493..8826e33 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -14,8 +14,7 @@ custom_target( 'man-pages', - command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@'], - env : {'FLASHROM_VERSION' : meson.project_version() }, + command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@'], build_always_stale : true, # sphinx handles rebuilds output : man_outputs, install : true, @@ -26,8 +25,7 @@ if get_option('documentation').auto() or get_option('documtation').enabled() custom_target( 'documentation', - command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'], - env : {'FLASHROM_VERSION' : meson.project_version() }, + command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'], build_always_stale : true, # sphinx handles rebuilds output : 'html', install : true, diff --git a/meson.build b/meson.build index caeea6e..2ecb5fa 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('flashromutils', 'c', version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(), license : 'GPL-2.0', - meson_version : '>=0.57.0', + meson_version : '>=0.53.0', default_options : [ 'warning_level=2', 'c_std=c99', -- To view, visit https://review.coreboot.org/c/flashrom/+/73361 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iff9b8307c741a247a652cf666935c9485fa493fa Gerrit-Change-Number: 73361 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: tree/: Drop default_spi_probe_opcode for NULL case
by Thomas Heijligen (Code Review) 03 Mar '23

03 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/70264 ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tree/: Drop default_spi_probe_opcode for NULL case ...................................................................... tree/: Drop default_spi_probe_opcode for NULL case A NULL func pointer is necessary and sufficient for the condition `NULL func pointer => true' as to not need this boilerplate as it implies default behaviour of a supported opcode within the `check_block_eraser()` match supported loop. Ran; ``` $ find . -name '*.[c,h]' -exec sed -i '/.probe_opcode = default_spi_probe_opcode,/d' '{}' \; ``` Change-Id: Id502c5d2596ad1db52faf05723083620e4c52c12 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/70264 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M asm106x.c M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M ch347_spi.c M dediprog.c M digilent_spi.c M dirtyjtag_spi.c M flashrom.c M ft2232_spi.c M include/chipdrivers.h M include/programmer.h M it87spi.c M jlink_spi.c M linux_spi.c M mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M parade_lspcon.c M pickit2_spi.c M raiden_debug_spi.c M realtek_mst_i2c_spi.c M sb600spi.c M serprog.c M spi.c M spi25_statusreg.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 29 files changed, 34 insertions(+), 35 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/asm106x.c b/asm106x.c index 78c0b74..0c9cf11 100644 --- a/asm106x.c +++ b/asm106x.c @@ -125,7 +125,6 @@ .shutdown = asm106x_shutdown, .read = default_spi_read, .write_256 = default_spi_write_256, - .probe_opcode = default_spi_probe_opcode, }; static int asm106x_init(const struct programmer_cfg *cfg) diff --git a/bitbang_spi.c b/bitbang_spi.c index 6488650..dde5dbc 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -146,7 +146,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = bitbang_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data) diff --git a/buspirate_spi.c b/buspirate_spi.c index 192d274..d3114c4 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -181,7 +181,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = buspirate_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static const struct buspirate_speeds spispeeds[] = { diff --git a/ch341a_spi.c b/ch341a_spi.c index b9be18e..a66503d 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -416,7 +416,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = ch341a_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, .delay = ch341a_spi_delay, }; diff --git a/ch347_spi.c b/ch347_spi.c index e828f00..570e25b 100644 --- a/ch347_spi.c +++ b/ch347_spi.c @@ -257,7 +257,6 @@ .write_256 = default_spi_write_256, .write_aai = default_spi_write_aai, .shutdown = ch347_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* Largely copied from ch341a_spi.c */ diff --git a/dediprog.c b/dediprog.c index 60ce6e6..734fcfa 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1038,7 +1038,6 @@ .write_256 = dediprog_spi_write_256, .write_aai = dediprog_spi_write_aai, .shutdown = dediprog_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* diff --git a/digilent_spi.c b/digilent_spi.c index 5fa60b9..ef0d23c 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -336,7 +336,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = digilent_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static bool default_reset(struct libusb_device_handle *handle) diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c index 9f0e43b..19764f6 100644 --- a/dirtyjtag_spi.c +++ b/dirtyjtag_spi.c @@ -197,7 +197,6 @@ .write_256 = default_spi_write_256, .write_aai = default_spi_write_aai, .shutdown = dirtyjtag_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int dirtyjtag_spi_init(const struct programmer_cfg *cfg) diff --git a/flashrom.c b/flashrom.c index 62e5757..3cf67f1 100644 --- a/flashrom.c +++ b/flashrom.c @@ -470,7 +470,7 @@ if (flash->mst->buses_supported & BUS_SPI) { const uint8_t *opcode = spi_get_opcode_from_erasefn(eraser.block_erase); for (int i = 0; opcode[i]; i++) { - if (!flash->mst->spi.probe_opcode(flash, opcode[i])) { + if (!spi_probe_opcode(flash, opcode[i])) { if (log) msg_cdbg("block erase function and layout found " "but SPI master doesn't support the function. "); diff --git a/ft2232_spi.c b/ft2232_spi.c index 16bcfe3..7d7283b 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -299,7 +299,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = ft2232_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* Returns 0 upon success, a negative number upon errors. */ diff --git a/include/chipdrivers.h b/include/chipdrivers.h index 71b8795..c485aaf 100644 --- a/include/chipdrivers.h +++ b/include/chipdrivers.h @@ -26,6 +26,7 @@ int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); +bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); /* spi25.c */ int probe_spi_rdid(struct flashctx *flash); diff --git a/include/programmer.h b/include/programmer.h index f6bc8ce..d8d8b4a 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -312,7 +312,7 @@ int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*shutdown)(void *data); - bool (*probe_opcode)(const struct flashctx *flash, uint8_t opcode); + bool (*probe_opcode)(const struct flashctx *flash, uint8_t opcode); /* NULL func implies true. */ void (*delay) (const struct flashctx *flash, unsigned int usecs); void (*get_region)(const struct flashctx *flash, unsigned int addr, struct flash_region *region); void *data; @@ -321,7 +321,6 @@ int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); int register_spi_master(const struct spi_master *mst, void *data); /* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */ diff --git a/it87spi.c b/it87spi.c index b2da875..9c64659 100644 --- a/it87spi.c +++ b/it87spi.c @@ -320,7 +320,6 @@ .write_256 = it8716f_spi_chip_write_256, .write_aai = spi_chip_write_1, .shutdown = it8716f_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static uint16_t it87spi_probe(const struct programmer_cfg *cfg, uint16_t port) diff --git a/jlink_spi.c b/jlink_spi.c index 7743c40..af61fb5 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -188,7 +188,6 @@ .write_256 = default_spi_write_256, .features = SPI_MASTER_4BA, .shutdown = jlink_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int jlink_spi_init(const struct programmer_cfg *cfg) diff --git a/linux_spi.c b/linux_spi.c index d849fe4..ceca05f 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -119,7 +119,6 @@ .read = linux_spi_read, .write_256 = linux_spi_write_256, .shutdown = linux_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* Read max buffer size from sysfs, or use page size as fallback. */ diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index e9c3c8c..d28e478 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -459,7 +459,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = mediatek_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int get_params(const struct programmer_cfg *cfg, bool *allow_brick) diff --git a/mstarddc_spi.c b/mstarddc_spi.c index 1172cb2..44ebd05 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -145,7 +145,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = mstarddc_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* Returns 0 upon success, a negative number upon errors. */ diff --git a/ni845x_spi.c b/ni845x_spi.c index dec6f6f..253025f 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -535,7 +535,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = ni845x_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int ni845x_spi_init(const struct programmer_cfg *cfg) diff --git a/parade_lspcon.c b/parade_lspcon.c index 8b92789..dfcf659 100644 --- a/parade_lspcon.c +++ b/parade_lspcon.c @@ -436,7 +436,6 @@ .write_256 = parade_lspcon_write_256, .write_aai = parade_lspcon_write_aai, .shutdown = parade_lspcon_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int get_params(const struct programmer_cfg *cfg, bool *allow_brick) diff --git a/pickit2_spi.c b/pickit2_spi.c index 56894d9..a072a20 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -383,7 +383,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = pickit2_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int pickit2_spi_init(const struct programmer_cfg *cfg) diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index 5111ae9..c5642ff 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1323,7 +1323,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = raiden_debug_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int match_endpoint(struct libusb_endpoint_descriptor const *descriptor, diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index ee6390c..57677ec 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -440,7 +440,6 @@ .write_256 = realtek_mst_i2c_spi_write_256, .write_aai = realtek_mst_i2c_spi_write_aai, .shutdown = realtek_mst_i2c_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter_isp, bool *allow_brick) diff --git a/sb600spi.c b/sb600spi.c index 2e6c2ec..df7caed 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -604,7 +604,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = sb600spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static const struct spi_master spi_master_yangtze = { @@ -616,7 +615,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = sb600spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static const struct spi_master spi_master_promontory = { @@ -628,7 +626,6 @@ .read = promontory_read_memmapped, .write_256 = default_spi_write_256, .shutdown = sb600spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev) diff --git a/serprog.c b/serprog.c index 4d93e07..b51f0cf 100644 --- a/serprog.c +++ b/serprog.c @@ -463,7 +463,6 @@ .command = serprog_spi_send_command, .read = default_spi_read, .write_256 = default_spi_write_256, - .probe_opcode = default_spi_probe_opcode, .delay = serprog_delay, }; diff --git a/spi.c b/spi.c index 3b3f622..3e81da2 100644 --- a/spi.c +++ b/spi.c @@ -139,9 +139,11 @@ return default_spi_write_aai(flash, buf, start, len); } -bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode) +bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode) { - return true; + if (!flash->mst->spi.probe_opcode) + return true; /* no probe_opcode implies default of supported. */ + return flash->mst->spi.probe_opcode(flash, opcode); } int register_spi_master(const struct spi_master *mst, void *data) @@ -155,8 +157,7 @@ } } - if (!mst->write_256 || !mst->read || !mst->probe_opcode || - (!mst->command && !mst->multicommand)) { + if (!mst->write_256 || !mst->read || (!mst->command && !mst->multicommand)) { msg_perr("%s called with incomplete master definition. " "Please report a bug at flashrom(a)flashrom.org\n", __func__); diff --git a/spi25_statusreg.c b/spi25_statusreg.c index ec2c101..d452416 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -132,7 +132,7 @@ return 1; } - if (!flash->mst->spi.probe_opcode(flash, write_cmd[0])) { + if (!spi_probe_opcode(flash, write_cmd[0])) { msg_pdbg("%s: write to register %d not supported by programmer, ignoring.\n", __func__, reg); return SPI_INVALID_OPCODE; } @@ -246,7 +246,7 @@ return 1; } - if (!flash->mst->spi.probe_opcode(flash, read_cmd)) { + if (!spi_probe_opcode(flash, read_cmd)) { msg_pdbg("%s: read from register %d not supported by programmer.\n", __func__, reg); return SPI_INVALID_OPCODE; } diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 726cdcf..f9046df 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -469,7 +469,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = stlinkv3_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; static int stlinkv3_spi_init(const struct programmer_cfg *cfg) diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 958d4ea..43acaad 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -171,7 +171,6 @@ .read = default_spi_read, .write_256 = default_spi_write_256, .shutdown = usbblaster_shutdown, - .probe_opcode = default_spi_probe_opcode, }; /* Returns 0 upon success, a negative number upon errors. */ diff --git a/wbsio_spi.c b/wbsio_spi.c index ee79ef2..febe6ed 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -192,7 +192,6 @@ .write_256 = spi_chip_write_1, .write_aai = spi_chip_write_1, .shutdown = wbsio_spi_shutdown, - .probe_opcode = default_spi_probe_opcode, }; int wbsio_check_for_spi(void) -- To view, visit https://review.coreboot.org/c/flashrom/+/70264 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id502c5d2596ad1db52faf05723083620e4c52c12 Gerrit-Change-Number: 70264 Gerrit-PatchSet: 8 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit March 2023