- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: cli_classic.c: Make -r/-w/-v argument optional
by Daniel Campello (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Nico Huber, David Hendricks, Edward O'Callaghan, Angel Pons. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52362 ) Change subject: cli_classic.c: Make -r/-w/-v argument optional ...................................................................... Patch Set 18: (1 comment) Patchset: PS18: > See my comments on the other CL. For reference on *some* of the call sites: https://source.chromium. […] friendly ping on the discussion regarding the future of the optional r/w/v arguments -- To view, visit https://review.coreboot.org/c/flashrom/+/52362 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I15384b92cb987a6ea1bb4369ef415488b9cf7f41 Gerrit-Change-Number: 52362 Gerrit-PatchSet: 18 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 13 Jul 2021 02:13:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: it87spi.c: Enable probing of IT8620
by Michael Niewöhner (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Daniel Maslowski, Sophie van Soest, Paul Menzel. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56055 ) Change subject: it87spi.c: Enable probing of IT8620 ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56055 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0be9effe4a2f1f9699e016c7fc45018c9c522cbc Gerrit-Change-Number: 56055 Gerrit-PatchSet: 10 Gerrit-Owner: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Daniel Maslowski <info(a)orangecms.org> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Daniel Maslowski <info(a)orangecms.org> Gerrit-Attention: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Tue, 13 Jul 2021 00:12:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: chipset_enable.c: Mark Z97 as OK
by Michael Niewöhner (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Sophie van Soest. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56060 ) Change subject: chipset_enable.c: Mark Z97 as OK ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56060 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I73bdd9afefae8e7c013d400e17a15e56d84322f4 Gerrit-Change-Number: 56060 Gerrit-PatchSet: 3 Gerrit-Owner: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Comment-Date: Tue, 13 Jul 2021 00:11:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: spi_master: Add shutdown function in spi_master struct
by Anastasia Klimchuk (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55932 ) Change subject: spi_master: Add shutdown function in spi_master struct ...................................................................... Patch Set 4: (1 comment) File spi.c: https://review.coreboot.org/c/flashrom/+/55932/comment/3193da15_041a3773 PS3, Line 142: } > Technically not needed, but this should have another set of braces. Done -- To view, visit https://review.coreboot.org/c/flashrom/+/55932 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Gerrit-Change-Number: 55932 Gerrit-PatchSet: 4 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 12 Jul 2021 23:10:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: spi_master: Add shutdown function in spi_master struct
by Anastasia Klimchuk (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Thomas Heijligen, Angel Pons, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Thomas Heijligen, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/55932 to look at the new patch set (#4). Change subject: spi_master: Add shutdown function in spi_master struct ...................................................................... spi_master: Add shutdown function in spi_master struct With this, register_spi_master can take care of register_shutdown as well, and every spi master only needs to call register_spi_master instead of calling both register_spi_master and register_shutdown. Testing: In dummyflasher, comment out free(data) in shutdown. Test fails with error: ../dummyflasher.c:949: note: block 0x55e0727a6e40 allocated here ERROR: dummy_init_and_shutdown_test_success leaked 1 block(s) Means, shutdown function is invoked for drivers with "old" API (so, transitioning from old to new API is not breaking anything). Next patches in the chain converts spi masters to use new API. BUG=b:185191942 TEST=builds and ninja test Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M programmer.h M spi.c 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/32/55932/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/55932 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Gerrit-Change-Number: 55932 Gerrit-PatchSet: 4 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> 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-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: it87spi.c: Enable probing of IT8620
by Felix Singer (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Daniel Maslowski, Sophie van Soest, Paul Menzel, Michael Niewöhner. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56055 ) Change subject: it87spi.c: Enable probing of IT8620 ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56055 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0be9effe4a2f1f9699e016c7fc45018c9c522cbc Gerrit-Change-Number: 56055 Gerrit-PatchSet: 10 Gerrit-Owner: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Daniel Maslowski <info(a)orangecms.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Attention: Daniel Maslowski <info(a)orangecms.org> Gerrit-Attention: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Mon, 12 Jul 2021 20:31:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: chipset_enable.c: Mark Z97 as OK
by Felix Singer (Code Review) 13 Jul '21

13 Jul '21

Attention is currently required from: Sophie van Soest, Michael Niewöhner. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56060 ) Change subject: chipset_enable.c: Mark Z97 as OK ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56060 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I73bdd9afefae8e7c013d400e17a15e56d84322f4 Gerrit-Change-Number: 56060 Gerrit-PatchSet: 3 Gerrit-Owner: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Sophie van Soest <sophie(a)entropie.rocks> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Mon, 12 Jul 2021 20:31:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Use dependency lists to generate NEED_<library> vars
by Nico Huber (Code Review) 12 Jul '21

12 Jul '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55881 ) Change subject: Makefile: Use dependency lists to generate NEED_<library> vars ...................................................................... Makefile: Use dependency lists to generate NEED_<library> vars Change-Id: I30e6430a7e833a7f74eb973fb55bf1947ae2d87b Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55881 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile 1 file changed, 4 insertions(+), 26 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/Makefile b/Makefile index 4148172..a021267 100644 --- a/Makefile +++ b/Makefile @@ -532,7 +532,6 @@ endif else endif -NEED_LIBPCI += CONFIG_INTERNAL endif ifeq ($(CONFIG_ENE_LPC), yes) @@ -579,69 +578,58 @@ ifeq ($(CONFIG_NIC3COM), yes) FEATURE_CFLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o -NEED_LIBPCI += CONFIG_NIC3COM endif ifeq ($(CONFIG_GFXNVIDIA), yes) FEATURE_CFLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o -NEED_LIBPCI += CONFIG_GFXNVIDIA endif ifeq ($(CONFIG_SATASII), yes) FEATURE_CFLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o -NEED_LIBPCI += CONFIG_SATASII endif ifeq ($(CONFIG_ATAHPT), yes) FEATURE_CFLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o -NEED_LIBPCI += CONFIG_ATAHPT endif ifeq ($(CONFIG_ATAVIA), yes) FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o -NEED_LIBPCI += CONFIG_ATAVIA endif ifeq ($(CONFIG_ATAPROMISE), yes) FEATURE_CFLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o -NEED_LIBPCI += CONFIG_ATAPROMISE endif ifeq ($(CONFIG_IT8212), yes) FEATURE_CFLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o -NEED_LIBPCI += CONFIG_IT8212 endif ifeq ($(CONFIG_FT2232_SPI), yes) # This is a totally ugly hack. FEATURE_CFLAGS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_FT2232_SPI=1'") -NEED_LIBFTDI += CONFIG_FT2232_SPI PROGRAMMER_OBJS += ft2232_spi.o endif ifeq ($(CONFIG_USBBLASTER_SPI), yes) # This is a totally ugly hack. FEATURE_CFLAGS += $(call debug_shell,grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_USBBLASTER_SPI=1'") -NEED_LIBFTDI += CONFIG_USBBLASTER_SPI PROGRAMMER_OBJS += usbblaster_spi.o endif ifeq ($(CONFIG_PICKIT2_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o -NEED_LIBUSB1 += CONFIG_PICKIT2_SPI endif ifeq ($(CONFIG_STLINKV3_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_STLINKV3_SPI=1' PROGRAMMER_OBJS += stlinkv3_spi.o -NEED_LIBUSB1 += CONFIG_STLINKV3_SPI endif ifeq ($(CONFIG_LSPCON_I2C_SPI), yes) @@ -662,43 +650,36 @@ ifeq ($(CONFIG_DRKAISER), yes) FEATURE_CFLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o -NEED_LIBPCI += CONFIG_DRKAISER endif ifeq ($(CONFIG_NICREALTEK), yes) FEATURE_CFLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o -NEED_LIBPCI += CONFIG_NICREALTEK endif ifeq ($(CONFIG_NICNATSEMI), yes) FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o -NEED_LIBPCI += CONFIG_NICNATSEMI endif ifeq ($(CONFIG_NICINTEL), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o -NEED_LIBPCI += CONFIG_NICINTEL endif ifeq ($(CONFIG_NICINTEL_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o -NEED_LIBPCI += CONFIG_NICINTEL_SPI endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o -NEED_LIBPCI += CONFIG_NICINTEL_EEPROM endif ifeq ($(CONFIG_OGP_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o -NEED_LIBPCI += CONFIG_OGP_SPI endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) @@ -710,19 +691,16 @@ ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_LIBUSB1 += CONFIG_DEDIPROG endif ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' PROGRAMMER_OBJS += developerbox_spi.o -NEED_LIBUSB1 += CONFIG_DEVELOPERBOX_SPI endif ifeq ($(CONFIG_SATAMV), yes) FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o -NEED_LIBPCI += CONFIG_SATAMV endif ifeq ($(CONFIG_LINUX_MTD), yes) @@ -747,17 +725,14 @@ ifeq ($(CONFIG_CH341A_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o -NEED_LIBUSB1 += CONFIG_CH341A_SPI endif ifeq ($(CONFIG_DIGILENT_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_DIGILENT_SPI=1' PROGRAMMER_OBJS += digilent_spi.o -NEED_LIBUSB1 += CONFIG_DIGILENT_SPI endif ifeq ($(CONFIG_JLINK_SPI), yes) -NEED_LIBJAYLINK += CONFIG_JLINK_SPI FEATURE_CFLAGS += -D'CONFIG_JLINK_SPI=1' PROGRAMMER_OBJS += jlink_spi.o endif @@ -797,6 +772,7 @@ endif endif +NEED_LIBPCI := $(call filter_deps,$(DEPENDS_ON_LIBPCI)) ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes # This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually. @@ -839,7 +815,7 @@ endif - +NEED_LIBUSB1 := $(call filter_deps,$(DEPENDS_ON_LIBUSB1)) ifneq ($(NEED_LIBUSB1), ) CHECK_LIBUSB1 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' @@ -858,6 +834,7 @@ endif endif +NEED_LIBFTDI := $(call filter_deps,$(DEPENDS_ON_LIBFTDI)) ifneq ($(NEED_LIBFTDI), ) FTDILIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libftdi1 || $(PKG_CONFIG) --libs libftdi || printf "%s" "-lftdi -lusb") FEATURE_CFLAGS += $(call debug_shell,grep -q "FT232H := yes" .features && printf "%s" "-D'HAVE_FT232H=1'") @@ -868,6 +845,7 @@ # into a hard requirement for libusb, defeating the purpose of auto-enabling. endif +NEED_LIBJAYLINK := $(call filter_deps,$(DEPENDS_ON_LIBJAYLINK)) ifneq ($(NEED_LIBJAYLINK), ) CHECK_LIBJAYLINK = yes JAYLINKLIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libjaylink) -- To view, visit https://review.coreboot.org/c/flashrom/+/55881 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I30e6430a7e833a7f74eb973fb55bf1947ae2d87b Gerrit-Change-Number: 55881 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> 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]: Makefile: Enable bitbang_spi based on its dependency list
by Nico Huber (Code Review) 12 Jul '21

12 Jul '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55880 ) Change subject: Makefile: Enable bitbang_spi based on its dependency list ...................................................................... Makefile: Enable bitbang_spi based on its dependency list Change-Id: I2a22667cfe14e4c5816b3bce13de632941690d17 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55880 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile 1 file changed, 8 insertions(+), 17 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/Makefile b/Makefile index 8f99dc0..4148172 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,12 @@ $(eval override $(p) := no))) endef +define filter_deps +$(strip $(foreach p,$1, \ + $(if $(filter $($(p)),yes), \ + $(p)))) +endef + define disable_all $(foreach p,$1, \ $(eval override $(p) := no)) @@ -479,27 +485,12 @@ endif # Bitbanging SPI infrastructure, default off unless needed. -ifeq ($(CONFIG_RAYER_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_PONY_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_INTERNAL), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_NICINTEL_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_OGP_SPI), yes) + +ifneq ($(call filter_deps,$(DEPENDS_ON_BITBANG_SPI)), ) override CONFIG_BITBANG_SPI = yes else CONFIG_BITBANG_SPI ?= no endif -endif -endif -endif -endif ############################################################################### # Handle CONFIG_* variables that depend on others set (and verified) above. -- To view, visit https://review.coreboot.org/c/flashrom/+/55880 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a22667cfe14e4c5816b3bce13de632941690d17 Gerrit-Change-Number: 55880 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> 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]: Makefile: Disable libusb/libpci programmers via dependency lists
by Nico Huber (Code Review) 12 Jul '21

12 Jul '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55879 ) Change subject: Makefile: Disable libusb/libpci programmers via dependency lists ...................................................................... Makefile: Disable libusb/libpci programmers via dependency lists Change-Id: Ic2e56059a5cd7bd9f3d74d27866ded97e86d6ef1 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55879 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile 1 file changed, 13 insertions(+), 28 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/Makefile b/Makefile index a1f4a62..8f99dc0 100644 --- a/Makefile +++ b/Makefile @@ -140,6 +140,19 @@ $(eval override $(p) := no))) endef +define disable_all +$(foreach p,$1, \ + $(eval override $(p) := no)) +endef + +ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no) +$(call disable_all,$(DEPENDS_ON_LIBUSB1)) +endif + +ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) +$(call disable_all,$(DEPENDS_ON_LIBPCI)) +endif + ############################################################################### # General OS-specific settings. # 1. Prepare for later by gathering information about host and target OS @@ -465,34 +478,6 @@ $(eval $(var)=yes))) endif -ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no) -override CONFIG_CH341A_SPI = no -override CONFIG_DEDIPROG = no -override CONFIG_DIGILENT_SPI = no -override CONFIG_DEVELOPERBOX_SPI = no -override CONFIG_PICKIT2_SPI = no -override CONFIG_RAIDEN_DEBUG_SPI = no -override CONFIG_STLINKV3_SPI = no -endif -ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) -override CONFIG_INTERNAL = no -override CONFIG_NIC3COM = no -override CONFIG_GFXNVIDIA = no -override CONFIG_SATASII = no -override CONFIG_ATAHPT = no -override CONFIG_ATAVIA = no -override CONFIG_ATAPROMISE = no -override CONFIG_IT8212 = no -override CONFIG_DRKAISER = no -override CONFIG_NICREALTEK = no -override CONFIG_NICNATSEMI = no -override CONFIG_NICINTEL = no -override CONFIG_NICINTEL_SPI = no -override CONFIG_NICINTEL_EEPROM = no -override CONFIG_OGP_SPI = no -override CONFIG_SATAMV = no -endif - # Bitbanging SPI infrastructure, default off unless needed. ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes -- To view, visit https://review.coreboot.org/c/flashrom/+/55879 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic2e56059a5cd7bd9f3d74d27866ded97e86d6ef1 Gerrit-Change-Number: 55879 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> 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

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit