- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: Makeile: reenable internal programmer for mipsel
by Thomas Heijligen (Code Review) 22 Jan '22

22 Jan '22

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/61300 ) Change subject: Makeile: reenable internal programmer for mipsel ...................................................................... Makeile: reenable internal programmer for mipsel Make CONFIG_INTERNAL an alias for CONFIG_INTERNAL_X86 or CONFIG_INTERNAL_MIPS on the respective platforms. This allows for handling different system dependencies like DEPENDS_ON_X86_IO without the need to have an empty implementaion of those. Change-Id: Ia607ea60c3d7d15fe231fa412595992dadc535ad Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile M board_enable.c M chipset_enable.c M internal.c 4 files changed, 45 insertions(+), 31 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/00/61300/1 diff --git a/Makefile b/Makefile index d4de2ff..079a1ad 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,8 @@ CONFIG_SERPROG \ DEPENDS_ON_BITBANG_SPI := \ - CONFIG_INTERNAL \ + CONFIG_INTERNAL_X86 \ + CONFIG_INTERNAL_MIPSEL \ CONFIG_NICINTEL_SPI \ CONFIG_OGP_SPI \ CONFIG_PONY_SPI \ @@ -110,7 +111,8 @@ CONFIG_ATAPROMISE \ CONFIG_DRKAISER \ CONFIG_GFXNVIDIA \ - CONFIG_INTERNAL \ + CONFIG_INTERNAL_X86 \ + CONFIG_INTERNAL_MIPSEL \ CONFIG_IT8212 \ CONFIG_NICINTEL \ CONFIG_NICINTEL_EEPROM \ @@ -120,12 +122,12 @@ CONFIG_SATASII \ DEPENDS_ON_X86_MSR := \ - CONFIG_INTERNAL \ + CONFIG_INTERNAL_X86 \ DEPENDS_ON_X86_PORT_IO := \ CONFIG_ATAHPT \ CONFIG_ATAPROMISE \ - CONFIG_INTERNAL \ + CONFIG_INTERNAL_X86 \ CONFIG_NIC3COM \ CONFIG_NICNATSEMI \ CONFIG_NICREALTEK \ @@ -138,7 +140,8 @@ CONFIG_ATAVIA \ CONFIG_DRKAISER \ CONFIG_GFXNVIDIA \ - CONFIG_INTERNAL \ + CONFIG_INTERNAL_X86 \ + CONFIG_INTERNAL_MIPSEL \ CONFIG_IT8212 \ CONFIG_NIC3COM \ CONFIG_NICINTEL \ @@ -327,8 +330,12 @@ endif # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) -ifneq ($(ARCH)-little, $(filter $(ARCH), x86 mips)-$(ENDIAN)) -$(call mark_unsupported,CONFIG_INTERNAL) +ifneq ($(ARCH), x86) +$(call mark_unsupported,CONFIG_INTERNAL_X86) +endif + +ifneq ($(ARCH) $(ENDIAN), mips little) +$(call mark_unsupported,CONFIG_INTERNAL_MIPSEL) endif ifeq ($(HAS_LIBPCI), no) @@ -432,6 +439,12 @@ # Always enable internal/onboard support for now. CONFIG_INTERNAL ?= yes +ifeq ($(CONFIG_INTERNAL) $(ARCH), yes x86) +CONFIG_INTERNAL_X86 := yes +endif +ifeq ($(CONFIG_INTERNAL) $(ARCH) $(ENDIAN), yes mips little) +CONFIG_INTERNAL_MIPSEL := yes +endif # Always enable serprog for now. CONFIG_SERPROG ?= yes @@ -597,17 +610,16 @@ FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' -ifeq ($(CONFIG_INTERNAL), yes) +ifeq ($(filter $(CONFIG_INTERNAL_X86) $(CONFIG_INTERNAL_MIPSEL), yes), yes) FEATURE_FLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o -ifeq ($(ARCH), x86) -PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o -PROGRAMMER_OBJS += ichspi.o dmi.o +endif + +ifeq ($(CONFIG_INTERNAL_X86), yes) ifeq ($(CONFIG_INTERNAL_DMI), yes) FEATURE_FLAGS += -D'CONFIG_INTERNAL_DMI=1' endif -else -endif +PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o ichspi.o dmi.o endif ifeq ($(CONFIG_SERPROG), yes) diff --git a/board_enable.c b/board_enable.c index c23e257..14e556c 100644 --- a/board_enable.c +++ b/board_enable.c @@ -25,11 +25,11 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess_x86_io.h" -#include "hwaccess_x86_msr.h" #include "platform/pci.h" #if defined(__i386__) || defined(__x86_64__) +#include "hwaccess_x86_io.h" +#include "hwaccess_x86_msr.h" /* * Helper functions for many Winbond Super I/Os of the W836xx range. */ diff --git a/chipset_enable.c b/chipset_enable.c index d72300e..6ed8141 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -33,14 +33,15 @@ #include <errno.h> #include "flash.h" #include "programmer.h" -#include "hwaccess_x86_io.h" -#include "hwaccess_x86_msr.h" #include "hwaccess_physmap.h" #include "platform/pci.h" #define NOT_DONE_YET 1 #if defined(__i386__) || defined(__x86_64__) +#include "hwaccess_x86_io.h" +#include "hwaccess_x86_msr.h" + static int enable_flash_ali_m1533(struct pci_dev *dev, const char *name) { diff --git a/internal.c b/internal.c index 7a13e4c..03bc7ca 100644 --- a/internal.c +++ b/internal.c @@ -19,19 +19,12 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess_x86_io.h" #include "hwaccess_physmap.h" #include "platform/pci.h" -int is_laptop = 0; -int laptop_ok = 0; - -int force_boardenable = 0; -int force_boardmismatch = 0; - -enum chipbustype internal_buses_supported = BUS_NONE; - #if defined(__i386__) || defined(__x86_64__) +#include "hwaccess_x86_io.h" + void probe_superio(void) { probe_superio_winbond(); @@ -59,6 +52,14 @@ #endif +int is_laptop = 0; +int laptop_ok = 0; + +int force_boardenable = 0; +int force_boardmismatch = 0; + +enum chipbustype internal_buses_supported = BUS_NONE; + static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { @@ -183,11 +184,6 @@ } free(arg); - if (rget_io_perms()) { - ret = 1; - goto internal_init_exit; - } - /* Default to Parallel/LPC/FWH flash devices. If a known host controller * is found, the host controller init routine sets the * internal_buses_supported bitfield. @@ -213,6 +209,11 @@ } #if defined(__i386__) || defined(__x86_64__) + if (rget_io_perms()) { + ret = 1; + goto internal_init_exit; + } + if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) { if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" -- To view, visit https://review.coreboot.org/c/flashrom/+/61300 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia607ea60c3d7d15fe231fa412595992dadc535ad Gerrit-Change-Number: 61300 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: cli_classic.c: Convert do_erase() to libflashrom call
by Anastasia Klimchuk (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60068 ) Change subject: cli_classic.c: Convert do_erase() to libflashrom call ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/60068 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8566164e7dbad69cf478b24208014f10fb99e4d0 Gerrit-Change-Number: 60068 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> 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-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:57:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: meson: sync programmer dependencies from Makefile
by Edward O'Callaghan (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Thomas Heijligen, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61287 ) Change subject: meson: sync programmer dependencies from Makefile ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/61287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iae93111fd48865f3fe8dd0eb637349b9a0c4affc Gerrit-Change-Number: 61287 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(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-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:40:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess: fix build on non-x86 targets
by Edward O'Callaghan (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Paul Menzel, Thomas Heijligen, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61194 ) Change subject: hwaccess: fix build on non-x86 targets ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/61194 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e Gerrit-Change-Number: 61194 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(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: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:39:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: meson: sync programmer dependencies from Makefile
by Peter Marheine (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61287 ) Change subject: meson: sync programmer dependencies from Makefile ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://review.coreboot.org/c/flashrom/+/61287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iae93111fd48865f3fe8dd0eb637349b9a0c4affc Gerrit-Change-Number: 61287 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(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-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:15:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: meson: build hwaccess only on x86
by Peter Marheine (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Nico Huber, Thomas Heijligen. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61198 ) Change subject: meson: build hwaccess only on x86 ...................................................................... Patch Set 3: Code-Review-1 (1 comment) File meson.build: https://review.coreboot.org/c/flashrom/+/61198/comment/9d272e08_5dd780cd PS3, Line 357: error('RAW access is not available on non-x86 platforms. Disable the programmer which needs it. Use `meson build -Dpciutils=false -Dconfig_rayer_spi=false`') > Well, the comment about ARM is not wrong. But I have to admit it's misleading […] I hadn't realized that the Meson configuration had diverged so far from the Makefile; I've remedied that in https://review.coreboot.org/c/flashrom/+/61287 by copying the overall structure used in the Makefile. Since the x86 hwaccess headers are included in some non-x86 builds as part of the internal programmer, they do still need changes in order to build for non-x86 systems (even with the Makefile, though I was unable to actually cross-compile with the Makefile for seemingly pkg-config related reasons). I've fixed that in https://review.coreboot.org/c/flashrom/+/61194. Chromium uses Meson for all builds of flashrom, so removing the support would be unhelpful for us. I am not familiar with any conversation that came with its initial introduction, but I assume there was sufficient agreement that it's worth having. -- To view, visit https://review.coreboot.org/c/flashrom/+/61198 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iafabe8b4b2a95697773a739501dfc62d880d3f6d Gerrit-Change-Number: 61198 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:15:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess: fix build on non-x86 targets
by Peter Marheine (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Paul Menzel, Thomas Heijligen, Edward O'Callaghan. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61194 ) Change subject: hwaccess: fix build on non-x86 targets ...................................................................... Patch Set 3: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/61194/comment/bd9cc178_9acdb780 PS1, Line 22: Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e > Missing Signed-off-by line? Done Patchset: PS1: > The hwaccess_x86 files should only get compiled on x86 platforms. So as the code which requires it. […] The hwaccess_x86 headers are included in components of the internal programmer that are also built on non-x86: while there are issues with the Meson configuration (fixed in the following CL), the Makefile build is also broken. I've now opted to put the x86 guards in the headers rather than in the files that include them because otherwise the guards would need to be duplicated across three other files. -- To view, visit https://review.coreboot.org/c/flashrom/+/61194 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e Gerrit-Change-Number: 61194 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(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: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Fri, 21 Jan 2022 05:15:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess: fix build on non-x86 targets
by Peter Marheine (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Edward O'Callaghan, Peter Marheine. Hello build bot (Jenkins), Thomas Heijligen, Edward O'Callaghan, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/61194 to look at the new patch set (#3). Change subject: hwaccess: fix build on non-x86 targets ...................................................................... hwaccess: fix build on non-x86 targets The changes to hwaccess in commit 49d758698a0dd166679c48b1a2785e50e9b0cc83 cause build failure on non-x86 systems because the hwaccess_x86_* headers are included in some files that are built for all platforms (particularly those in the internal programmer) and those headers in turn include <sys/io.h> which only exists on x86. This change makes the hwaccess_x86 headers a nop on non-x86 platforms, and adds a define (set in the header as appropriate) allowing callers to detect the presence of rget_io_perms(): that function is used by the internal programmer, which is also supported on non-x86 systems. The comment on the stub implementation of rget_io_perms() is also modified to remove references to non-x86 platforms, since that file is only built on x86 now. BUG=None TEST=meson build succeeds for both x86 and ARM targets Signed-off-by: Peter Marheine <pmarheine(a)chromium.org> Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e --- M hwaccess_x86_io.c M hwaccess_x86_io.h M hwaccess_x86_msr.h M internal.c 4 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/94/61194/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/61194 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I20f122679c30340b2c73afd7419e79644ddc3c4e Gerrit-Change-Number: 61194 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(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: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom: Convert do_read() into a libflashrom user
by Anastasia Klimchuk (Code Review) 21 Jan '22

21 Jan '22

Attention is currently required from: Nico Huber, Edward O'Callaghan. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60430 ) Change subject: flashrom: Convert do_read() into a libflashrom user ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/60430 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id2addadb891c482ee3f69da806062d7a88776675 Gerrit-Change-Number: 60430 Gerrit-PatchSet: 4 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Fri, 21 Jan 2022 04:53:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: extract operation only uses layout files
by Edward O'Callaghan (Code Review) 21 Jan '22

21 Jan '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59921 ) Change subject: flashrom.c: extract operation only uses layout files ...................................................................... flashrom.c: extract operation only uses layout files This change fixes a bug on handling the extract operation. The extract operation reads out the layout regions to filenames corresponding to the respective layout region names. read_flash_to_file() does this work via write_buf_to_include_args(). This change makes the call to write_buf_to_file() optional as it is still required for -r (read operation) but not for -x (extract operation). BUG=b:209512852 TEST=flashrom -x Fixes: commit ce983bccaab450d358854494f15c2d8a1846d56b Change-Id: Ibc9a4e2966385863345f06662521d6d0e4685121 Signed-off-by: Daniel Campello <campello(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59921 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M flashrom.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index bd34676..dd443b9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1098,7 +1098,8 @@ goto out_free; } - ret = write_buf_to_file(buf, size, filename); + if (filename) + ret = write_buf_to_file(buf, size, filename); out_free: free(buf); msg_cinfo("%s.\n", ret ? "FAILED" : "done"); 5 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/+/59921 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibc9a4e2966385863345f06662521d6d0e4685121 Gerrit-Change-Number: 59921 Gerrit-PatchSet: 7 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit