May 2026 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: print.c: Fix alignment in print_supported_boards_helper()
by David Hendricks (Code Review) July 2, 2026

July 2, 2026

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/37407 ) Change subject: print.c: Fix alignment in print_supported_boards_helper() ...................................................................... print.c: Fix alignment in print_supported_boards_helper() Commit 61e16e5 eliminated some duplicate logic for printing test status, but in doing so introduced a regression where some entries in `flashrom -L` output became unaligned. Up until then, it was assumed that the status field will always be 8-wide, including space for padding. This patch fixes alignment when using test_state_to_text() by making the padding consistent with other fields where a for-loop is used to pad the field up to a maximum width. Change-Id: Ie0a0b45c6466d14447aca443c2697e2048c6ef14 Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- M flash.h M print.c 2 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/07/37407/1 diff --git a/flash.h b/flash.h index 1a9bd9f..e7b1c89 100644 --- a/flash.h +++ b/flash.h @@ -145,10 +145,11 @@ enum test_state { OK = 0, - NT = 1, /* Not tested */ - BAD, /* Known to not work */ - DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ - NA, /* Not applicable (e.g. write support on ROM chips) */ + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ + TEST_STATE_END, /* Not a test state, just an indicator of how many are defined. */ }; #define TEST_UNTESTED (struct tested){ .probe = NT, .read = NT, .erase = NT, .write = NT } diff --git a/print.c b/print.c index 6a7ff5d..e5be6b6 100644 --- a/print.c +++ b/print.c @@ -35,6 +35,20 @@ } } +static size_t max_test_state_len(void) +{ + int i; + size_t max_len; + + for (i = max_len = 0; i < TEST_STATE_END; i++) { + size_t len = strlen(test_state_to_text(i)); + if (len > max_len) + max_len = len; + } + + return max_len; +} + static int print_supported_chips(void) { const char *delim = "/"; @@ -388,8 +402,12 @@ for (i = strlen("Board"); i < maxboardlen; i++) msg_ginfo(" "); - msg_ginfo("Status Required value for\n"); - for (i = 0; i < maxvendorlen + maxboardlen + strlen("Status "); i++) + msg_ginfo("Status"); + for (i = strlen("Status"); i < max_test_state_len(); i++) + msg_ginfo(" "); + + msg_ginfo("Required value for\n"); + for (i = 0; i < maxvendorlen + maxboardlen + max_test_state_len(); i++) msg_ginfo(" "); msg_ginfo("-p internal:mainboard=\n"); @@ -401,14 +419,10 @@ for (i = 0; i < maxboardlen - strlen(b->name); i++) msg_ginfo(" "); - switch (b->working) { - case OK: msg_ginfo("OK "); break; - case NT: msg_ginfo("NT "); break; - case DEP: msg_ginfo("DEP "); break; - case NA: msg_ginfo("N/A "); break; - case BAD: - default: msg_ginfo("BAD "); break; - } + const char *test_state = test_state_to_text(b->working); + msg_ginfo("%s", test_state); + for (i = 0; i < max_test_state_len() - strlen(test_state); i++) + msg_ginfo(" "); for (e = board_matches; e->vendor_name != NULL; e++) { if (strcmp(e->vendor_name, b->vendor) -- To view, visit https://review.coreboot.org/c/flashrom/+/37407 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie0a0b45c6466d14447aca443c2697e2048c6ef14 Gerrit-Change-Number: 37407 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

5 8

[M] Change in flashrom[main]: log.h: Extract log declarations to a separate header
by Sergii Dmytruk (Code Review) May 31, 2026

May 31, 2026

Attention is currently required from: Aarya, Anastasia Klimchuk, Antonio Vázquez Blanco, David Reguera Garcia (Dreg), Jean THOMAS, Matti Finder, Miklós Márton, Nicholas, Nikolai Artemiev, Peter Marheine, wthai(a)nvidia.com. Sergii Dmytruk has posted comments on this change by Antonio Vázquez Blanco. ( https://review.coreboot.org/c/flashrom/+/92330?usp=email ) Change subject: log.h: Extract log declarations to a separate header ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/92330?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: If8b831e6b9d63eed0ae824a70e72cef18b0dc113 Gerrit-Change-Number: 92330 Gerrit-PatchSet: 7 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: David Reguera Garcia (Dreg) <regueragarciadavid(a)gmail.com> Gerrit-Reviewer: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-Reviewer: Matti Finder <matti.finder(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Nicholas <nic.c3.14(a)gmail.com> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: wthai(a)nvidia.com Gerrit-Attention: wthai(a)nvidia.com Gerrit-Attention: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Attention: David Reguera Garcia (Dreg) <regueragarciadavid(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nicholas <nic.c3.14(a)gmail.com> Gerrit-Attention: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Matti Finder <matti.finder(a)gmail.com> Gerrit-Comment-Date: Sun, 31 May 2026 16:29:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in flashrom[main]: feat: Add fault injection programmer (chaos)
by Abdelkader Boudih (Code Review) May 30, 2026

May 30, 2026

Attention is currently required from: Anastasia Klimchuk, Peter Marheine. Hello Anastasia Klimchuk, Peter Marheine, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/91839?usp=email to look at the new patch set (#4). Change subject: feat: Add fault injection programmer (chaos) ...................................................................... feat: Add fault injection programmer (chaos) Add a new 'fault' programmer that wraps an existing SPI backend and injects deterministic, reproducible faults for testing verification logic and retry mechanisms under realistic failure conditions. Supported fault types: - Bit corruption on reads (configurable probability) - Short reads (configurable minimum ratio) - Write failures (configurable probability) - Write lies: silent no-ops reported as success - Partial writes (truncated to random length) Uses an embedded Xoshiro256** PRNG seeded via the 'seed' parameter for cross-platform reproducibility. Same seed always produces the same fault sequence regardless of OS, libc, or compiler. Usage: flashrom -p fault:backend=dummy,seed=42,flip_prob=0.1 Change-Id: I0d76e89faca1b10eac3fd4597402c7380e0b4188 Signed-off-by: Abdelkader Boudih <flashrom(a)seuros.com> --- M MAINTAINERS M doc/classic_cli_manpage.rst M doc/release_notes/devel.rst M include/programmer.h M meson.build M meson_options.txt M programmer_table.c A programmers/fault.c M test_build.sh A tests/fault.c M tests/tests.c M tests/tests.h 12 files changed, 876 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/91839/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/91839?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I0d76e89faca1b10eac3fd4597402c7380e0b4188 Gerrit-Change-Number: 91839 Gerrit-PatchSet: 4 Gerrit-Owner: Abdelkader Boudih <coreboot(a)seuros.com> 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-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org>

1 0

[L] Change in flashrom[main]: feat: Add fault injection programmer (chaos)
by Abdelkader Boudih (Code Review) May 30, 2026

May 30, 2026

Attention is currently required from: Anastasia Klimchuk, Peter Marheine. Abdelkader Boudih has posted comments on this change by Abdelkader Boudih. ( https://review.coreboot.org/c/flashrom/+/91839?usp=email ) Change subject: feat: Add fault injection programmer (chaos) ...................................................................... Patch Set 3: (7 comments) File meson_options.txt: https://review.coreboot.org/c/flashrom/+/91839/comment/cf82170b_73b16d31?us… : PS2, Line 13: fault > There is one more place where meson option is used: in a script for Jenkins `test_build.sh` […] Done File programmers/fault.c: https://review.coreboot.org/c/flashrom/+/91839/comment/ee1b9c9e_734866ec?us… : PS2, Line 5: SPDX-FileCopyrightText: 2026 Abdelkader Boudih <flashrom(a)seuros.com> > Same question as in the other patch: would you agree to add yourself as a maintainer for this progra […] Done https://review.coreboot.org/c/flashrom/+/91839/comment/be16ae64_cc831dd2?us… : PS2, Line 406: /* : * Parameter parsing helpers : */ > And this one, let's remove this comment Done https://review.coreboot.org/c/flashrom/+/91839/comment/ae4b1195_d90f63cb?us… : PS2, Line 431: : /* : * Programmer init : */ > I don't feel this comment adding value, let's just remove it. Done File tests/fault.c: https://review.coreboot.org/c/flashrom/+/91839/comment/937d1768_394f5072?us… : PS2, Line 11: > A comment for fault tests in general: you can use libflashrom api directly here, not only lifecycle […] Done https://review.coreboot.org/c/flashrom/+/91839/comment/60927437_e1afe58d?us… : PS2, Line 48: const char *expected_matched_names[1] = {"W25Q128.V"}; > Maybe you can add a comment here, that for this test fault type is not specified, so everything work […] Done https://review.coreboot.org/c/flashrom/+/91839/comment/dfc30106_1ac1b226?us… : PS2, Line 58: the 3-byte RDID response is unlikely to be corrupted. > I understand it is unlikely, but still it's possible - which makes the test non-deterministic? (or p […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/91839?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I0d76e89faca1b10eac3fd4597402c7380e0b4188 Gerrit-Change-Number: 91839 Gerrit-PatchSet: 3 Gerrit-Owner: Abdelkader Boudih <coreboot(a)seuros.com> 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-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sat, 30 May 2026 15:48:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org>

1 0

[L] Change in flashrom[main]: feat: Add fault injection programmer (chaos)
by Abdelkader Boudih (Code Review) May 30, 2026

May 30, 2026

Attention is currently required from: Abdelkader Boudih, Peter Marheine. Hello Anastasia Klimchuk, Peter Marheine, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/91839?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by build bot (Jenkins) Change subject: feat: Add fault injection programmer (chaos) ...................................................................... feat: Add fault injection programmer (chaos) Add a new 'fault' programmer that wraps an existing SPI backend and injects deterministic, reproducible faults for testing verification logic and retry mechanisms under realistic failure conditions. Supported fault types: - Bit corruption on reads (configurable probability) - Short reads (configurable minimum ratio) - Write failures (configurable probability) - Write lies: silent no-ops reported as success - Partial writes (truncated to random length) Uses an embedded Xoshiro256** PRNG seeded via the 'seed' parameter for cross-platform reproducibility. Same seed always produces the same fault sequence regardless of OS, libc, or compiler. Usage: flashrom -p fault:backend=dummy,seed=42,flip_prob=0.1 Change-Id: I0d76e89faca1b10eac3fd4597402c7380e0b4188 Signed-off-by: Abdelkader Boudih <flashrom(a)seuros.com> --- M MAINTAINERS M doc/classic_cli_manpage.rst M doc/release_notes/devel.rst M include/programmer.h M meson.build M meson_options.txt M programmer_table.c A programmers/fault.c M test_build.sh A tests/fault.c M tests/tests.c M tests/tests.h 12 files changed, 888 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/91839/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/91839?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I0d76e89faca1b10eac3fd4597402c7380e0b4188 Gerrit-Change-Number: 91839 Gerrit-PatchSet: 3 Gerrit-Owner: Abdelkader Boudih <coreboot(a)seuros.com> 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-Attention: Abdelkader Boudih <coreboot(a)seuros.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org>

1 0

[S] Change in flashrom[main]: doc: Add includes ordering guidelines
by Anastasia Klimchuk (Code Review) May 30, 2026

May 30, 2026

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/92757?usp=email ) Change subject: doc: Add includes ordering guidelines ...................................................................... doc: Add includes ordering guidelines Change-Id: I43241e312b5c2aba847c2d67eccc3a3f64b8f9c5 Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/92757 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M doc/dev_guide/development_guide.rst 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Anastasia Klimchuk: Looks good to me, approved build bot (Jenkins): Verified diff --git a/doc/dev_guide/development_guide.rst b/doc/dev_guide/development_guide.rst index 8c7ef67..7f9a1cd 100644 --- a/doc/dev_guide/development_guide.rst +++ b/doc/dev_guide/development_guide.rst @@ -144,9 +144,18 @@ * Tables are the only exception to the hard limit and may be as long as needed for practical purposes. -We try to **reuse as much code as possible** and create new files only if -absolutely needed, so if you find a function somewhere in the tree which -already does what you want, please use it. +Other guidelines: + +* We try to **reuse as much code as possible** and create new files only if + absolutely needed, so if you find a function somewhere in the tree which + already does what you want, please use it. + +* Order of includes: + + 1. If applicable, header file with the same name as the current source, in double quotes + 2. Other flashrom headers in double quotes + 3. Third-party headers in angle brackets + 4. Standard C and system headers in angle brackets Testing a patch --------------- -- To view, visit https://review.coreboot.org/c/flashrom/+/92757?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I43241e312b5c2aba847c2d67eccc3a3f64b8f9c5 Gerrit-Change-Number: 92757 Gerrit-PatchSet: 3 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[L] Change in flashrom[main]: cli_classic: add options for managing OTP regions
by Anastasia Klimchuk (Code Review) May 29, 2026

May 29, 2026

Attention is currently required from: Florian Eckert. Anastasia Klimchuk has posted comments on this change by Florian Eckert. ( https://review.coreboot.org/c/flashrom/+/92264?usp=email ) Change subject: cli_classic: add options for managing OTP regions ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: One thing I just remembered: it would be great to add the info about new feature in the Recent development doc. The doc source is in `doc/release_notes/devel.rst`. You can add a new section to the end of doc "OTP support via security register" and write a paragraph in your own words. It's a big feature, lets everyone know about it! :) Thank you so much! You can do this comment later, when everything gets close to approval. -- To view, visit https://review.coreboot.org/c/flashrom/+/92264?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Ia024fe630004dd8a328135243354842e7a1a463d Gerrit-Change-Number: 92264 Gerrit-PatchSet: 7 Gerrit-Owner: Florian Eckert <Eckert.Florian(a)googlemail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Florian Eckert <Eckert.Florian(a)googlemail.com> Gerrit-Comment-Date: Fri, 29 May 2026 09:35:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in flashrom[main]: flashchips: Add support for MXIC MX25L3236D
by Anastasia Klimchuk (Code Review) May 29, 2026

May 29, 2026

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/92881?usp=email ) Change subject: flashchips: Add support for MXIC MX25L3236D ...................................................................... flashchips: Add support for MXIC MX25L3236D The MX25L3236D has been tested by ch341a programmer : read, write, erase MX25L3236D datasheet is available at the following URL: https://www.macronix.com/Lists/Datasheet/Attachments/8550/MX25L3236D,%203V,… Change-Id: Id7af56ade5ececd3a0a76191eb7c91131a136f79 Signed-off-by: Xian Zheng <xianzheng(a)mxic.com.cn> Reviewed-on: https://review.coreboot.org/c/flashrom/+/92881 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M include/flashchips.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/include/flashchips.h b/include/flashchips.h index 47e16fc..c63c5a4 100644 --- a/include/flashchips.h +++ b/include/flashchips.h @@ -543,7 +543,7 @@ #define MACRONIX_MX66U1G45G 0x253b /* MX66U1G45G */ #define MACRONIX_MX66U2G45G 0x253c -#define MACRONIX_MX25L3235D 0x5E16 /* MX25L3225D/MX25L3235D/MX25L3237D */ +#define MACRONIX_MX25L3235D 0x5E16 /* MX25L3225D/MX25L3235D/MX25L3237D/MX25L3236D */ #define MACRONIX_MX25L6495F 0x9517 #define MACRONIX_MX25L3255E 0x9e16 #define MACRONIX_MX77L25650F 0x7519 -- To view, visit https://review.coreboot.org/c/flashrom/+/92881?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Id7af56ade5ececd3a0a76191eb7c91131a136f79 Gerrit-Change-Number: 92881 Gerrit-PatchSet: 3 Gerrit-Owner: Name of user not set #1006189 Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[M] Change in flashrom[main]: Refactor imports to follow coding convention proposed ordering
by Antonio Vázquez Blanco (Code Review) May 27, 2026

May 27, 2026

Attention is currently required from: Aarya, Anastasia Klimchuk, Antonio Vázquez Blanco, Nikolai Artemiev, Stefan Reinauer. Hello Aarya, Anastasia Klimchuk, Nikolai Artemiev, Stefan Reinauer, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/93001?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by build bot (Jenkins) Change subject: Refactor imports to follow coding convention proposed ordering ...................................................................... Refactor imports to follow coding convention proposed ordering Change-Id: I41146d8fa3f2a892b26597d7f3b953819ae34887 Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- M 82802ab.c M at45db.c M bitbang_spi.c M board_enable.c M cbtable.c M chipset_enable.c M cli_classic.c M cli_common.c M cli_getopt.c M cli_output.c M custom_baud.c M custom_baud_darwin.c M custom_baud_linux.c M dmi.c M edi.c M erasure_layout.c M flashchips.c M flashrom.c M fmap.c M helpers.c M helpers_fileio.c M include/erasure_layout.h M include/fmap.h 23 files changed, 73 insertions(+), 66 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/01/93001/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/93001?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I41146d8fa3f2a892b26597d7f3b953819ae34887 Gerrit-Change-Number: 93001 Gerrit-PatchSet: 2 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org>

1 0

[M] Change in flashrom[main]: Refactor imports to follow coding convention proposed ordering
by Antonio Vázquez Blanco (Code Review) May 27, 2026

May 27, 2026

Antonio Vázquez Blanco has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/93001?usp=email ) Change subject: Refactor imports to follow coding convention proposed ordering ...................................................................... Refactor imports to follow coding convention proposed ordering Change-Id: I41146d8fa3f2a892b26597d7f3b953819ae34887 Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- M 82802ab.c M at45db.c M bitbang_spi.c M board_enable.c M cbtable.c M chipset_enable.c M cli_classic.c M cli_common.c M cli_getopt.c M cli_output.c M custom_baud.c M custom_baud_darwin.c M custom_baud_linux.c M dmi.c M edi.c M erasure_layout.c M flashchips.c M flashrom.c M fmap.c M helpers.c M helpers_fileio.c M include/erasure_layout.h M include/fmap.h M include/platform/endian.h 24 files changed, 73 insertions(+), 67 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/01/93001/1 diff --git a/82802ab.c b/82802ab.c index c5f6cf0..24fb606 100644 --- a/82802ab.c +++ b/82802ab.c @@ -13,10 +13,10 @@ * - Order number: 290658-004 */ -#include <stdbool.h> #include "flash.h" #include "parallel.h" #include "chipdrivers.h" +#include <stdbool.h> void print_status_82802ab(uint8_t status) { diff --git a/at45db.c b/at45db.c index b2a7787..1fe0162 100644 --- a/at45db.c +++ b/at45db.c @@ -8,7 +8,7 @@ * SPDX-FileCopyrightText: 2025 Marco Müller */ -#include <string.h> +#include "platform/string.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" diff --git a/bitbang_spi.c b/bitbang_spi.c index a2c7551..377eec0 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -5,13 +5,13 @@ * SPDX-FileCopyrightText: 2009, 2010 Carl-Daniel Hailfinger */ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <ctype.h> +#include "platform/string.h" #include "programmer.h" #include "spi.h" #include "platform/udelay.h" +#include <stdlib.h> +#include <ctype.h> +#include <stdio.h> /* Note that CS# is active low, so val=0 means the chip is active. */ static void bitbang_spi_set_cs(const struct bitbang_spi_master * const master, int val, void *spi_data) diff --git a/board_enable.c b/board_enable.c index 6a86e57..fedd95b 100644 --- a/board_enable.c +++ b/board_enable.c @@ -12,14 +12,14 @@ * Contains the board specific flash enables. */ -#include <strings.h> -#include <string.h> -#include <stdbool.h> -#include <stdlib.h> +#include "platform/string.h" #include "flash.h" #include "programmer.h" #include "pcidev.h" #include "dmi.h" +#include <strings.h> +#include <stdbool.h> +#include <stdlib.h> #if defined(__i386__) || defined(__x86_64__) diff --git a/cbtable.c b/cbtable.c index 8858776..4161d1d 100644 --- a/cbtable.c +++ b/cbtable.c @@ -8,15 +8,15 @@ * SPDX-FileCopyrightText: 2010 Carl-Daniel Hailfinger */ -#include <unistd.h> -#include <stdio.h> -#include <ctype.h> -#include <strings.h> -#include <string.h> +#include "platform/string.h" #include "flash.h" #include "programmer.h" #include "coreboot_tables.h" #include "hwaccess_physmap.h" +#include <unistd.h> +#include <stdio.h> +#include <ctype.h> +#include <strings.h> static char *cb_vendor = NULL, *cb_model = NULL; diff --git a/chipset_enable.c b/chipset_enable.c index ccf65e4..c0723e7 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -15,17 +15,17 @@ * Contains the chipset specific flash enables. */ -#include <stdbool.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <inttypes.h> -#include <errno.h> +#include "platform/string.h" #include "flash.h" #include "programmer.h" #include "hwaccess_physmap.h" #include "pcidev.h" #include "helpers.h" +#include <stdbool.h> +#include <stdlib.h> +#include <unistd.h> +#include <inttypes.h> +#include <errno.h> #define NOT_DONE_YET 1 diff --git a/cli_classic.c b/cli_classic.c index 8aa1f1d..0a9246b 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -8,23 +8,23 @@ * SPDX-FileCopyrightText: 2008,2009,2010 Carl-Daniel Hailfinger */ -#include <errno.h> -#include <stdio.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <string.h> -#include <stdbool.h> -#include <stdlib.h> -#include <stdint.h> -#include <cli_getopt.h> -#include <cli_output.h> -#include <time.h> +#include "platform/string.h" #include "flash.h" #include "flashchips.h" #include "fmap.h" #include "programmer.h" #include "libflashrom.h" #include "helpers.h" +#include <errno.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <stdbool.h> +#include <stdlib.h> +#include <stdint.h> +#include <cli_getopt.h> +#include <cli_output.h> +#include <time.h> #if CONFIG_RPMC_ENABLED == 1 #include "rpmc.h" diff --git a/cli_common.c b/cli_common.c index c0e5b79..21966b4 100644 --- a/cli_common.c +++ b/cli_common.c @@ -7,9 +7,9 @@ * SPDX-FileCopyrightText: 2011-2014 Stefan Tauner */ +#include "flash.h" #include <stdlib.h> #include <string.h> -#include "flash.h" void print_chip_support_status(const struct flashchip *chip) { diff --git a/cli_getopt.c b/cli_getopt.c index 2427527..a0134b5 100644 --- a/cli_getopt.c +++ b/cli_getopt.c @@ -7,14 +7,14 @@ * SPDX-FileCopyrightText: Thomas Heijligen <thomas.heijligen(a)secunet.com> */ -#include <cli_getopt.h> +#include "cli_getopt.h" +#include "flash.h" #include <unistd.h> #include <wchar.h> #include <string.h> #include <limits.h> #include <stdlib.h> -#include "flash.h" char *optarg; int optind=1, opterr=1, optopt, optpos; diff --git a/cli_output.c b/cli_output.c index ece5ea9..3eabfef 100644 --- a/cli_output.c +++ b/cli_output.c @@ -6,7 +6,7 @@ * SPDX-FileCopyrightText: 2011 Carl-Daniel Hailfinger */ -#include <cli_output.h> +#include "cli_output.h" #include <stdio.h> #include <stdarg.h> diff --git a/custom_baud.c b/custom_baud.c index a66eef5..e631072 100644 --- a/custom_baud.c +++ b/custom_baud.c @@ -5,10 +5,10 @@ * SPDX-FileCopyrightText: 2017 Urja Rannikko <urjaman(a)gmail.com> */ -#include <errno.h> - #include "custom_baud.h" +#include <errno.h> + /* Stub, should not get called. */ int set_custom_baudrate(int fd, unsigned int baud, const enum custom_baud_stage stage, void *tio_wanted) { diff --git a/custom_baud_darwin.c b/custom_baud_darwin.c index 32390a2..af52fb7 100644 --- a/custom_baud_darwin.c +++ b/custom_baud_darwin.c @@ -5,12 +5,13 @@ * SPDX-FileCopyrightText: 2022 Peter Stuge <peter(a)stuge.se> */ +#include "custom_baud.h" + #include <termios.h> #include <sys/ioctl.h> #include <IOKit/serial/ioss.h> #include <errno.h> -#include "custom_baud.h" int use_custom_baud(unsigned int baud, const struct baudentry *baudtable) { diff --git a/custom_baud_linux.c b/custom_baud_linux.c index de23f65..2aa74c5 100644 --- a/custom_baud_linux.c +++ b/custom_baud_linux.c @@ -5,12 +5,13 @@ * SPDX-FileCopyrightText: 2017 Urja Rannikko <urjaman(a)gmail.com> */ +#include "custom_baud.h" + #include <sys/ioctl.h> #include <fcntl.h> #include <asm-generic/termbits.h> #include <asm-generic/ioctls.h> -#include "custom_baud.h" /* * This include hell above is why this is in a separate source file. See eg. diff --git a/dmi.c b/dmi.c index 5b58407..f14dc9c 100644 --- a/dmi.c +++ b/dmi.c @@ -10,15 +10,14 @@ #include "dmi.h" +#include "platform/string.h" +#include "flash.h" +#include "hwaccess_physmap.h" #include <ctype.h> #include <stdint.h> #include <stddef.h> #include <stdlib.h> -#include "platform/string.h" -#include "flash.h" -#include "hwaccess_physmap.h" - /* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */ #define SM_SUPPORT 0 diff --git a/edi.c b/edi.c index 539fc6f..89f1bb7 100644 --- a/edi.c +++ b/edi.c @@ -5,11 +5,12 @@ * SPDX-FileCopyrightText: 2015 Paul Kocialkowski <contact(a)paulk.fr> */ -#include <string.h> +#include "edi.h" + +#include "platform/string.h" #include "spi.h" #include "chipdrivers.h" #include "ene.h" -#include "edi.h" static unsigned int edi_read_buffer_length = EDI_READ_BUFFER_LENGTH_DEFAULT; diff --git a/erasure_layout.c b/erasure_layout.c index 0a1216d..a3ffef7 100644 --- a/erasure_layout.c +++ b/erasure_layout.c @@ -5,17 +5,17 @@ * SPDX-FileCopyrightText: 2022 Aarya Chaumal */ +#include "erasure_layout.h" + +#include "flash.h" +#include "layout.h" +#include "helpers.h" #include <limits.h> #include <stdbool.h> #include <stdlib.h> #include <limits.h> #include <string.h> -#include "flash.h" -#include "layout.h" -#include "erasure_layout.h" -#include "helpers.h" - static size_t calculate_block_count(const struct flashchip *chip, size_t eraser_idx) { size_t block_count = 0; diff --git a/flashchips.c b/flashchips.c index 6e0d022..78833ce 100644 --- a/flashchips.c +++ b/flashchips.c @@ -10,8 +10,9 @@ * SPDX-FileCopyrightText: 2025 Google LLC */ -#include "flash.h" #include "flashchips.h" + +#include "flash.h" #include "chipdrivers.h" /** diff --git a/flashrom.c b/flashrom.c index 719f3af..5572e89 100644 --- a/flashrom.c +++ b/flashrom.c @@ -9,16 +9,6 @@ * SPDX-FileCopyrightText: 2016 secunet Security Networks AG (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) */ -#include <stdbool.h> -#include <stdio.h> -#include <stdint.h> -#include <sys/types.h> -#include <string.h> -#include <unistd.h> -#include <stdlib.h> -#include <errno.h> -#include <ctype.h> - #include "flash.h" #include "parallel.h" #include "flashchips.h" @@ -28,6 +18,15 @@ #include "erasure_layout.h" #include "platform/udelay.h" #include "helpers.h" +#include <stdbool.h> +#include <stdio.h> +#include <stdint.h> +#include <sys/types.h> +#include <string.h> +#include <unistd.h> +#include <stdlib.h> +#include <errno.h> +#include <ctype.h> const char flashrom_version[] = FLASHROM_VERSION; diff --git a/fmap.c b/fmap.c index 84e7e8e..3918964 100644 --- a/fmap.c +++ b/fmap.c @@ -4,13 +4,14 @@ * SPDX-FileCopyrightText: 2018-present, Facebook Inc. All rights reserved. */ +#include "fmap.h" + +#include "flash.h" #include <ctype.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include "flash.h" -#include "fmap.h" static size_t fmap_size(const struct fmap *fmap) { diff --git a/helpers.c b/helpers.c index 9cc8dc9..74d918f 100644 --- a/helpers.c +++ b/helpers.c @@ -11,7 +11,7 @@ #include "flash.h" #include <ctype.h> #include <stdlib.h> -#include <string.h> +#include "platform/string.h" /* Returns the minimum number of bits needed to represent the given address. * FIXME: use mind-blowing implementation. */ diff --git a/helpers_fileio.c b/helpers_fileio.c index 17fa081..1a9c22b 100644 --- a/helpers_fileio.c +++ b/helpers_fileio.c @@ -6,6 +6,7 @@ * SPDX-FileCopyrightText: 2013 Stefan Tauner */ +#include "flash.h" #include <ctype.h> #include <stdlib.h> #include <string.h> @@ -17,7 +18,6 @@ #include <sys/stat.h> #endif -#include "flash.h" int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename) diff --git a/include/erasure_layout.h b/include/erasure_layout.h index 84e541c..535f644 100644 --- a/include/erasure_layout.h +++ b/include/erasure_layout.h @@ -8,6 +8,9 @@ #ifndef __ERASURE_LAYOUT_H__ #define __ERASURE_LAYOUT_H__ 1 +#include "layout.h" +#include "flash.h" + struct eraseblock_data { chipoff_t start_addr; chipoff_t end_addr; diff --git a/include/fmap.h b/include/fmap.h index 3b25021..650e90e 100644 --- a/include/fmap.h +++ b/include/fmap.h @@ -7,6 +7,7 @@ #ifndef __FMAP_H__ #define __FMAP_H__ 1 +#include "flash.h" #include <inttypes.h> #include <stdbool.h> diff --git a/include/platform/endian.h b/include/platform/endian.h index 34ca6e3..818a5c2 100644 --- a/include/platform/endian.h +++ b/include/platform/endian.h @@ -13,7 +13,6 @@ #ifndef __PLATFORM_ENDIAN_H__ #define __PLATFORM_ENDIAN_H__ -#include <stddef.h> #include <stdint.h> /** -- To view, visit https://review.coreboot.org/c/flashrom/+/93001?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I41146d8fa3f2a892b26597d7f3b953819ae34887 Gerrit-Change-Number: 93001 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0