September 2021 - flashrom-gerrit

Change in flashrom[master]: ch341a_spi: libusb functions can handle all platforms
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Felix Singer, Thomas Heijligen. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57889 ) Change subject: ch341a_spi: libusb functions can handle all platforms ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This would change the behavior on non-Linux platforms where libusb implements this API. Without us being able to test things right away. (Hate to say it) maybe something to post-pone after the next release? -- To view, visit https://review.coreboot.org/c/flashrom/+/57889 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If6f19744503055ab8e22c863b31e696808e0407d Gerrit-Change-Number: 57889 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Sun, 26 Sep 2021 15:56:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ft2232_spi: reintroduce generic GPIOL control
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Felix Singer, Alan Green, Angel Pons, Michael Niewöhner. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57810 ) Change subject: ft2232_spi: reintroduce generic GPIOL control ...................................................................... Patch Set 16: Code-Review+1 (5 comments) Patchset: PS16: Alan, would the new syntax suit your needs? File ft2232_spi.c: https://review.coreboot.org/c/flashrom/+/57810/comment/310892f1_87318f3a PS16, Line 483: msg_perr As the message says "warning", use msg_pwarn()? https://review.coreboot.org/c/flashrom/+/57810/comment/9d2ecba1_f5c3f5d0 PS16, Line 484: "in the future. Use `gpiolX=C` instead.\n"); We try to keep output within 80 columns. Could add a \n after the first sentence for instance. https://review.coreboot.org/c/flashrom/+/57810/comment/4586c346_7eaeb773 PS16, Line 513: arg_gpiol[3] = extract_programmer_param("gpiol3"); This looks a little odd. How about moving the call into the loop? We could still use an array for the string literals, e.g. const char *const gpiol_params[] = { "gpiol0", "gpiol1", ... char *const arg = extract_programmer_param(gpiol_params[pin]); Alternatively, a single buffer could be used like this: char gpiol_param[7]; snprintf(gpiol_param, sizeof(gpiol_param), "gpiol%d", pin); char *const arg = extract_programmer_param(gpiol_param); Also just noticed: In the current form, any premature `return` inside the loop would leak some of these arg_gpiol[] pointers. https://review.coreboot.org/c/flashrom/+/57810/comment/8d311a6c_c4f6ed80 PS16, Line 538: bool format_error = 0; Just to mention it, don't know how reasonable it would look: For error paths, using `goto` is common. The end of the loop body could look like this: free(arg); continue; format_error: msg_perr("Error: ..."); free(arg); return -2; } It would save us an indentation level. -- To view, visit https://review.coreboot.org/c/flashrom/+/57810 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3989f0f9596c090de52dca67183b1363dae59d3a Gerrit-Change-Number: 57810 Gerrit-PatchSet: 16 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Alan Green <avg(a)google.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alan Green <avg(a)google.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Sun, 26 Sep 2021 15:29:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.8: carve out `csgpiol` into its own section
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Felix Singer, Angel Pons, Michael Niewöhner. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57893 ) Change subject: flashrom.8: carve out `csgpiol` into its own section ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File flashrom.8.tmpl: https://review.coreboot.org/c/flashrom/+/57893/comment/d2d2cc60_ab1d0594 PS2, Line 843: and GPIO-based chip select Please drop this part. Basically, we'd want to revert the changes of CB:28911 made here. -- To view, visit https://review.coreboot.org/c/flashrom/+/57893 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic7379331d36b3068eacde5a983b4ccb3afc56c51 Gerrit-Change-Number: 57893 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Sun, 26 Sep 2021 15:05:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ft2232_spi: prevent use of reserved pins on some programmers
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Felix Singer, Angel Pons, Michael Niewöhner. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57809 ) Change subject: ft2232_spi: prevent use of reserved pins on some programmers ...................................................................... Patch Set 6: Code-Review+1 (2 comments) File ft2232_spi.c: https://review.coreboot.org/c/flashrom/+/57809/comment/b561e66a_b011ac32 PS6, Line 424: resered reser*v*ed https://review.coreboot.org/c/flashrom/+/57809/comment/0d1e69f6_5cca4339 PS6, Line 424: gets drop one `gets` please -- To view, visit https://review.coreboot.org/c/flashrom/+/57809 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ied450fa5ef358153adefec3beabc63a62c9f60cd Gerrit-Change-Number: 57809 Gerrit-PatchSet: 6 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Sun, 26 Sep 2021 14:59:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ft2232_spi: clarify the comment about gpio configuration
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/57808 ) Change subject: ft2232_spi: clarify the comment about gpio configuration ...................................................................... ft2232_spi: clarify the comment about gpio configuration The comment explaining gpio levels might be easily misunderstood when the reader misses the word `output`. Add an explicit description of handling of the GPIOL* pins to avoid that and make things even more clear. Change-Id: Iaceec889a65ead8cdde917f61b2a9695d440f781 Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/57808 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M ft2232_spi.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/ft2232_spi.c b/ft2232_spi.c index 0962f1c..df156d6 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -89,8 +89,11 @@ * "set data bits low byte" MPSSE command that sets the initial * state and the direction of the I/O pins. `cs_bits` pins default * to high and will be toggled during SPI transactions. All other - * output pins will be kept low all the time. On exit, all pins - * will be reconfigured as inputs. + * output pins will be kept low all the time. For some programmers, + * some reserved GPIOL* pins are used as outputs. Free GPIOL* pins + * are configured as inputs, while it's possible to use one of them + * as additional CS# signal through the parameter `csgpiol`. On exit, + * all pins will be reconfigured as inputs. * * The pin offsets are as follows: * TCK/SK is bit 0. 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/57808 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaceec889a65ead8cdde917f61b2a9695d440f781 Gerrit-Change-Number: 57808 Gerrit-PatchSet: 6 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: flashrom.8: add missing entry for `--flash-contents`
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/57807 ) Change subject: flashrom.8: add missing entry for `--flash-contents` ...................................................................... flashrom.8: add missing entry for `--flash-contents` Change-Id: I64a8200a86329bd26a2069c5dc39430de9f8ba09 Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/57807 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M flashrom.8.tmpl 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index c9620fe..788e254 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -290,6 +290,13 @@ .B "\-\-flash\-size" Prints out the detected flash chips size. .TP +.B "\-\-flash\-contents <ref\-file>" +The file contents of +.BR <ref\-file> +will be used to decide which parts of the flash need to be written. Providing +this saves an initial read of the full flash chip. Be careful, if the provided +data doesn't actually match the flash contents, results are undefined. +.TP .B "\-L, \-\-list\-supported" List the flash chips, chipsets, mainboards, and external programmers (including PCI, USB, parallel port, and serial port based devices) -- To view, visit https://review.coreboot.org/c/flashrom/+/57807 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I64a8200a86329bd26a2069c5dc39430de9f8ba09 Gerrit-Change-Number: 57807 Gerrit-PatchSet: 5 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: flashrom.8: replace `svn changelog` with `git history`
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/57811 ) Change subject: flashrom.8: replace `svn changelog` with `git history` ...................................................................... flashrom.8: replace `svn changelog` with `git history` Change-Id: If8659dd603cbabdb8e20d89f818072986373e24f Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/57811 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M flashrom.8.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 6962637..c9620fe 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -1573,7 +1573,7 @@ .br Yinghai Lu .br -some others, please see the flashrom svn changelog for details. +some others, please see the flashrom git history for details. .br All still active authors can be reached via .MTOB "flashrom(a)flashrom.org" "the mailing list" . -- To view, visit https://review.coreboot.org/c/flashrom/+/57811 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If8659dd603cbabdb8e20d89f818072986373e24f Gerrit-Change-Number: 57811 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: flashrom.8: add missing entry for `--flash-contents`
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Felix Singer, Angel Pons, Michael Niewöhner. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57807 ) Change subject: flashrom.8: add missing entry for `--flash-contents` ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57807 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I64a8200a86329bd26a2069c5dc39430de9f8ba09 Gerrit-Change-Number: 57807 Gerrit-PatchSet: 4 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Sun, 26 Sep 2021 14:56:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ich_descriptors: Add explicit checks for all chipsets
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Attention is currently required from: Michał Żygowski, Jonathan Zhang, David Hendricks, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57793 ) Change subject: ich_descriptors: Add explicit checks for all chipsets ...................................................................... Patch Set 3: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/57793/comment/4cdee6e3_96a30ceb PS3, Line 10: A new chipset : was added that necessitated adding back a check for an older : chipset. That's not accurate. It was the way that the new check was written that made more checks necessary. File ich_descriptors.c: https://review.coreboot.org/c/flashrom/+/57793/comment/786867a3_89395d49 PS1, Line 968: if (content->ICCRIBA != 0x34) : msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n"); > here too This one had a different message. -- To view, visit https://review.coreboot.org/c/flashrom/+/57793 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ica49477492876810a6fa212768b1ab9e8c12001f Gerrit-Change-Number: 57793 Gerrit-PatchSet: 3 Gerrit-Owner: David Hendricks Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Attention: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Attention: David Hendricks Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 26 Sep 2021 14:52:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: David Hendricks Gerrit-MessageType: comment

1 0

Change in flashrom[master]: remove compile guards
by Nico Huber (Code Review) 26 Sep '21

26 Sep '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/57797 ) Change subject: remove compile guards ...................................................................... remove compile guards The build system handles the decision when to build a file. Extra compile guards for the source files are not necessary. Change-Id: I76a76e05c7a7dd27637325ab1e9d8946fd5f9076 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/57797 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M amd_imc.c M atahpt.c M atapromise.c M ft2232_spi.c M ichspi.c M it85spi.c M it87spi.c M linux_spi.c M mcp6x_spi.c M mstarddc_spi.c M nic3com.c M nicnatsemi.c M nicrealtek.c M rayer_spi.c M satamv.c M sb600spi.c M usbblaster_spi.c M wbsio_spi.c 18 files changed, 0 insertions(+), 83 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/amd_imc.c b/amd_imc.c index 8b0bcf2..a3959e6 100644 --- a/amd_imc.c +++ b/amd_imc.c @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include "flash.h" #include "programmer.h" #include "hwaccess.h" @@ -151,5 +149,3 @@ return ret; } - -#endif diff --git a/atahpt.c b/atahpt.c index c627e0b..d9b56bc 100644 --- a/atahpt.c +++ b/atahpt.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include <string.h> #include "flash.h" @@ -97,7 +95,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/atapromise.c b/atapromise.c index e3009e4..0c187e3 100644 --- a/atapromise.c +++ b/atapromise.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <string.h> #include <stdlib.h> #include "flash.h" @@ -170,7 +168,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/ft2232_spi.c b/ft2232_spi.c index 15837d9..0962f1c 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if CONFIG_FT2232_SPI == 1 - #include <stdio.h> #include <strings.h> #include <string.h> @@ -599,4 +597,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; -#endif diff --git a/ichspi.c b/ichspi.c index 091e4e2..d345af2 100644 --- a/ichspi.c +++ b/ichspi.c @@ -19,8 +19,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <string.h> #include <stdlib.h> #include "flash.h" @@ -2113,5 +2111,3 @@ return 0; } - -#endif diff --git a/it85spi.c b/it85spi.c index dd0cb6c..17e4e10 100644 --- a/it85spi.c +++ b/it85spi.c @@ -20,8 +20,6 @@ * Contains the ITE IT85* SPI specific routines */ -#if defined(__i386__) || defined(__x86_64__) - #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -362,5 +360,3 @@ /* Set this as SPI controller. */ return register_spi_master(&spi_master_it85xx, data); } - -#endif diff --git a/it87spi.c b/it87spi.c index 3e422d7..5f6fb65 100644 --- a/it87spi.c +++ b/it87spi.c @@ -19,8 +19,6 @@ * Contains the ITE IT87* SPI specific routines */ -#if defined(__i386__) || defined(__x86_64__) - #include <string.h> #include <stdlib.h> #include <errno.h> @@ -464,5 +462,3 @@ } return ret; } - -#endif /* defined(__i386__) || defined(__x86_64__) */ diff --git a/linux_spi.c b/linux_spi.c index bd9ffb3..27a9a0d 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#if CONFIG_LINUX_SPI == 1 - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -256,5 +254,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#endif // CONFIG_LINUX_SPI == 1 diff --git a/mcp6x_spi.c b/mcp6x_spi.c index fa309ca..29d2663 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -19,8 +19,6 @@ * created by Michael Karcher. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include <ctype.h> #include "flash.h" @@ -192,5 +190,3 @@ return 0; } - -#endif diff --git a/mstarddc_spi.c b/mstarddc_spi.c index 8e2d5a8..71b02c0 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -13,8 +13,6 @@ * GNU General Public License for more details. */ -#if CONFIG_MSTARDDC_SPI == 1 - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -259,5 +257,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#endif diff --git a/nic3com.c b/nic3com.c index 2af0a52..79964ac 100644 --- a/nic3com.c +++ b/nic3com.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include "flash.h" #include "programmer.h" @@ -173,7 +171,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicnatsemi.c b/nicnatsemi.c index b2f381a..6216728 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include "flash.h" #include "programmer.h" @@ -110,7 +108,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/nicrealtek.c b/nicrealtek.c index ec821b4..70daeec 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include "flash.h" #include "programmer.h" @@ -151,7 +149,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/rayer_spi.c b/rayer_spi.c index 1102ff1..e65eb78 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -22,7 +22,6 @@ * most OS parport drivers will perform many unnecessary accesses although * this driver just treats the parallel port as a GPIO set. */ -#if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> #include <strings.h> @@ -334,7 +333,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/satamv.c b/satamv.c index 32ac11a..cdd2f27 100644 --- a/satamv.c +++ b/satamv.c @@ -15,7 +15,6 @@ */ /* Datasheets are not public (yet?) */ -#if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> #include "flash.h" @@ -191,7 +190,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#else -#error PCI port I/O access is not supported on this architecture yet. -#endif diff --git a/sb600spi.c b/sb600spi.c index fe7920f..7fa01af 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -18,8 +18,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <string.h> #include <stdlib.h> #include "flash.h" @@ -799,5 +797,3 @@ return 0; } - -#endif diff --git a/usbblaster_spi.c b/usbblaster_spi.c index bd4b1c9..8957df8 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -30,8 +30,6 @@ * See also the USB-Blaster Download Cable User Guide: http://www.altera.com/literature/ug/ug_usb_blstr.pdf */ -#if CONFIG_USBBLASTER_SPI == 1 - #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -237,5 +235,3 @@ .unmap_flash_region = fallback_unmap, .delay = internal_delay, }; - -#endif diff --git a/wbsio_spi.c b/wbsio_spi.c index a175b21..60b725f 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -14,8 +14,6 @@ * GNU General Public License for more details. */ -#if defined(__i386__) || defined(__x86_64__) - #include <stdlib.h> #include "flash.h" @@ -217,5 +215,3 @@ return register_spi_master(&spi_master_wbsio, data); } - -#endif /* defined(__i386__) || defined(__x86_64__) */ -- To view, visit https://review.coreboot.org/c/flashrom/+/57797 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I76a76e05c7a7dd27637325ab1e9d8946fd5f9076 Gerrit-Change-Number: 57797 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2021