January 2023 - flashrom-gerrit

[S] Change in flashrom[1.3.x]: tests: Fix warnings for 32-bit Linux
by Evan Benn (Code Review) 18 Jan '23

18 Jan '23

Evan Benn has uploaded a new patch set (#2). ( https://review.coreboot.org/c/flashrom/+/71285 ) Change subject: tests: Fix warnings for 32-bit Linux ...................................................................... tests: Fix warnings for 32-bit Linux Unit tests had int-to-pointer-cast warnings for 32-bit Linux environment, and since warnings are treated as errors this failed build with unit tests. Ticket: https://ticket.coreboot.org/issues/407 Original-Tested-By: Branden Waldner <scruffy99(a)gmail.com> Original-Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/72038 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Original-Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> (cherry picked from commit 87531ef11c00963100f20fac71c2428f54162916) Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 --- M tests/linux_spi.c 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/71285/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/71285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.3.x Gerrit-Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Gerrit-Change-Number: 71285 Gerrit-PatchSet: 2 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[1.3.x]: tests: Fix warnings for 32-bit Linux
by Evan Benn (Code Review) 18 Jan '23

18 Jan '23

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/71285 ) Change subject: tests: Fix warnings for 32-bit Linux ...................................................................... tests: Fix warnings for 32-bit Linux Unit tests had int-to-pointer-cast warnings for 32-bit Linux environment, and since warnings are treated as errors this failed build with unit tests. Ticket: https://ticket.coreboot.org/issues/407 Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Tested-By: Branden Waldner <scruffy99(a)gmail.com> Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/72038 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> (cherry picked from commit 87531ef11c00963100f20fac71c2428f54162916) --- M tests/linux_spi.c 1 file changed, 24 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/71285/1 diff --git a/tests/linux_spi.c b/tests/linux_spi.c index 2e3dc95..d71e5b4 100644 --- a/tests/linux_spi.c +++ b/tests/linux_spi.c @@ -23,14 +23,14 @@ /* First message has write array and write count */ unsigned int writecnt = msg[0].len; - unsigned char *writearr = (unsigned char *)msg[0].tx_buf; + unsigned char *writearr = (unsigned char *)(uintptr_t)msg[0].tx_buf; /* Second message has read array and read count */ unsigned int readcnt = msg[1].len; /* Detect probing */ if (writecnt == 1 && writearr[0] == JEDEC_RDID && readcnt == 3) { /* We need to populate read array. */ - unsigned char *readarr = (unsigned char *)msg[1].rx_buf; + unsigned char *readarr = (unsigned char *)(uintptr_t)msg[1].rx_buf; readarr[0] = 0xEF; /* WINBOND_NEX_ID */ readarr[1] = 0x40; /* WINBOND_NEX_W25Q128_V left byte */ readarr[2] = 0x18; /* WINBOND_NEX_W25Q128_V right byte */ -- To view, visit https://review.coreboot.org/c/flashrom/+/71285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.3.x Gerrit-Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Gerrit-Change-Number: 71285 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: flashrom_tester: Use Range and usize for all ranges
by Peter Marheine (Code Review) 18 Jan '23

18 Jan '23

Attention is currently required from: Evan Benn. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72004 ) Change subject: flashrom_tester: Use Range and usize for all ranges ...................................................................... Patch Set 7: Code-Review+1 (1 comment) File util/flashrom_tester/flashrom/src/cmd.rs: https://review.coreboot.org/c/flashrom/+/72004/comment/16394ea6_96f0796d PS5, Line 56: usize > yes this is where we get into the mess of the flashrom API types. getsize returns a `size_t`. […] I think you're right that we've covered this before. Sure, let's stick with usize. -- To view, visit https://review.coreboot.org/c/flashrom/+/72004 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic09be66c3598acf45fbe8952093006a9b185810a Gerrit-Change-Number: 72004 Gerrit-PatchSet: 7 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Wed, 18 Jan 2023 22:45:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Evan Benn <evanbenn(a)google.com> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: flashrom_tester: Rewrite IOOpts to support more operations
by Peter Marheine (Code Review) 18 Jan '23

18 Jan '23

Attention is currently required from: Evan Benn. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/71973 ) Change subject: flashrom_tester: Rewrite IOOpts to support more operations ...................................................................... Patch Set 6: (2 comments) File util/flashrom_tester/flashrom/src/cmd.rs: https://review.coreboot.org/c/flashrom/+/71973/comment/0163f94a_ba6792d3 PS4, Line 82: // an operation must provide a file or a region.file or both. > I think you are saying some things I get and some that I dont, I have had another attempt PTAL. […] It's moving in a direction that makes more sense; comments on the changes. File util/flashrom_tester/flashrom/src/cmd.rs: https://review.coreboot.org/c/flashrom/+/71973/comment/fe78b8a6_5058d806 PS6, Line 73: Option This still seems weird, in that it's required to specify either a file or a region with some file. It seems like we want to express these cases: * One file, entire chip * One file, part of chip * Multiple files, one per part of chip ..which can be translated to a type in a pretty straighforward way once we've enumerated the options that make sense: ``` enum FileIoMapping { /// Operate on the entire flash, mapped to an entire file. CompleteImage(Path), /// Operate on the named flash regions only, mapped to the corresponding portions of /// the given file. PartialImage(Path, &[&str]), /// Operate on the named flash regions, mapping each to a single file. FilePerRegion(&[(Path, &str)]), } ``` It could also then move the layout into the variants that operate on regions, to capture that layout only matters if you're not operating on the complete flash. -- To view, visit https://review.coreboot.org/c/flashrom/+/71973 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1cb46bb1b26949fd9c19949c43708a8b652e00da Gerrit-Change-Number: 71973 Gerrit-PatchSet: 6 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Wed, 18 Jan 2023 22:43:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Evan Benn <evanbenn(a)google.com> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: flashrom_tester: Rename simplify lock_test hwwp_locks_swwp_test
by Peter Marheine (Code Review) 18 Jan '23

18 Jan '23

Attention is currently required from: Evan Benn. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/71972 ) Change subject: flashrom_tester: Rename simplify lock_test hwwp_locks_swwp_test ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/71972/comment/01afe37c_036b6467 PS2, Line 7: simplify Only renaming it now. -- To view, visit https://review.coreboot.org/c/flashrom/+/71972 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6080622755ff16d8fba7044b38f9e09db0c62f97 Gerrit-Change-Number: 71972 Gerrit-PatchSet: 2 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Wed, 18 Jan 2023 22:22:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: chipset_enable.c: add PCI ID for TGL-UP3
by Anastasia Klimchuk (Code Review) 18 Jan '23

18 Jan '23

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/70388 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: chipset_enable.c: add PCI ID for TGL-UP3 ...................................................................... chipset_enable.c: add PCI ID for TGL-UP3 Add PCI ID for the Tiger Lake UP3 (Industrial SKU) SoC. Change-Id: Ie93af14eb5857bfe51964f6565e475b6249dd407 Signed-off-by: Jan Samek <jan.samek(a)siemens.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/70388 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M chipset_enable.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, but someone else must approve diff --git a/chipset_enable.c b/chipset_enable.c index b9144d1..480113a 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -2080,6 +2080,7 @@ {0x8086, 0x0284, B_S, DEP, "Intel", "Comet Lake U Premium", enable_flash_pch400}, {0x8086, 0x0285, B_S, DEP, "Intel", "Comet Lake U Base", enable_flash_pch400}, {0x8086, 0xa082, B_S, DEP, "Intel", "Tiger Lake U Premium", enable_flash_pch500}, + {0x8086, 0xa088, B_S, DEP, "Intel", "Tiger Lake UP3", enable_flash_pch500}, {0x8086, 0xa141, B_S, NT, "Intel", "Sunrise Point Desktop Sample", enable_flash_pch100}, {0x8086, 0xa142, B_S, NT, "Intel", "Sunrise Point Unknown Sample", enable_flash_pch100}, {0x8086, 0xa143, B_S, DEP, "Intel", "H110", enable_flash_pch100}, -- To view, visit https://review.coreboot.org/c/flashrom/+/70388 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie93af14eb5857bfe51964f6565e475b6249dd407 Gerrit-Change-Number: 70388 Gerrit-PatchSet: 4 Gerrit-Owner: Jan Samek <jan.samek(a)siemens.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: util: add bash completion script
by Anastasia Klimchuk (Code Review) 18 Jan '23

18 Jan '23

Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68247 ) Change subject: util: add bash completion script ...................................................................... Patch Set 13: (1 comment) Patchset: PS13: Congrats and thank you for your work! As we agreed, the next steps are: 1) Send an announcement on the mailing list, about the new cool feature, and probably mention how to install it. 2) Send another patch to add yourself into MAINTAINERS file for this util. -- To view, visit https://review.coreboot.org/c/flashrom/+/68247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Gerrit-Change-Number: 68247 Gerrit-PatchSet: 13 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 18 Jan 2023 21:12:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: util: add bash completion script
by Anastasia Klimchuk (Code Review) 18 Jan '23

18 Jan '23

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68247 ) Change subject: util: add bash completion script ...................................................................... util: add bash completion script Add a bash script for the flashrom CLI that auto-completes the command sequence. The script is generated from a template by substituting a list of enabled programmers. It requires an extra `bash-completion` package to work, but, fortunately, it's installed on most systems. Build system changes: meson: provide option `bash_completion` to determine if the script should be installed (depends on option `classic_cli`). makefile: make a list of enabled programmers (by using CONFIG_* variables) to do substitution manually Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68247 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M .gitignore M Makefile M meson.build M meson_options.txt A util/flashrom.bash-completion.tmpl 5 files changed, 192 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 8a32a70..1aa73d2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /flashrom-* /flashrom.exe /flashrom.8 +/flashrom.bash /libflashrom.a /libflashrom-doc/ diff --git a/Makefile b/Makefile index 425b58c..a7ab00b 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ INSTALL = install PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man +BASHCOMPDIR ?= $(PREFIX)/share/bash-completion/completions CFLAGS ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings EXPORTDIR ?= . RANLIB ?= ranlib @@ -585,11 +586,13 @@ PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o \ internal.o it87spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o \ ichspi.o dmi.o known_boards.o +ACTIVE_PROGRAMMERS += internal endif else ifeq ($(CONFIG_INTERNAL), yes) FEATURE_FLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o known_boards.o +ACTIVE_PROGRAMMERS += internal endif endif @@ -600,191 +603,229 @@ ifeq ($(CONFIG_SERPROG), yes) FEATURE_FLAGS += -D'CONFIG_SERPROG=1' PROGRAMMER_OBJS += serprog.o +ACTIVE_PROGRAMMERS += serprog endif ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_FLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o +ACTIVE_PROGRAMMERS += rayer_spi endif ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes) FEATURE_FLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1' PROGRAMMER_OBJS += raiden_debug_spi.o +ACTIVE_PROGRAMMERS += raiden_debug_spi endif ifeq ($(CONFIG_PONY_SPI), yes) FEATURE_FLAGS += -D'CONFIG_PONY_SPI=1' PROGRAMMER_OBJS += pony_spi.o +ACTIVE_PROGRAMMERS += pony_spi endif ifeq ($(CONFIG_NIC3COM), yes) FEATURE_FLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o +ACTIVE_PROGRAMMERS += nic3com endif ifeq ($(CONFIG_GFXNVIDIA), yes) FEATURE_FLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o +ACTIVE_PROGRAMMERS += gfxnvidia endif ifeq ($(CONFIG_SATASII), yes) FEATURE_FLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o +ACTIVE_PROGRAMMERS += satasii endif ifeq ($(CONFIG_ATAHPT), yes) FEATURE_FLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o +ACTIVE_PROGRAMMERS += atahpt endif ifeq ($(CONFIG_ATAVIA), yes) FEATURE_FLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o +ACTIVE_PROGRAMMERS += atavia endif ifeq ($(CONFIG_ATAPROMISE), yes) FEATURE_FLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o +ACTIVE_PROGRAMMERS += atapromise endif ifeq ($(CONFIG_IT8212), yes) FEATURE_FLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o +ACTIVE_PROGRAMMERS += it8212 endif ifeq ($(CONFIG_FT2232_SPI), yes) FEATURE_FLAGS += -D'CONFIG_FT2232_SPI=1' PROGRAMMER_OBJS += ft2232_spi.o +ACTIVE_PROGRAMMERS += ft2232_spi endif ifeq ($(CONFIG_USBBLASTER_SPI), yes) FEATURE_FLAGS += -D'CONFIG_USBBLASTER_SPI=1' PROGRAMMER_OBJS += usbblaster_spi.o +ACTIVE_PROGRAMMERS += usbblaster_spi endif ifeq ($(CONFIG_PICKIT2_SPI), yes) FEATURE_FLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o +ACTIVE_PROGRAMMERS += pickit2_spi endif ifeq ($(CONFIG_STLINKV3_SPI), yes) FEATURE_FLAGS += -D'CONFIG_STLINKV3_SPI=1' PROGRAMMER_OBJS += stlinkv3_spi.o +ACTIVE_PROGRAMMERS += stlinkv3_spi endif ifeq ($(CONFIG_PARADE_LSPCON), yes) FEATURE_FLAGS += -D'CONFIG_PARADE_LSPCON=1' PROGRAMMER_OBJS += parade_lspcon.o +ACTIVE_PROGRAMMERS += parade_lspcon endif ifeq ($(CONFIG_MEDIATEK_I2C_SPI), yes) FEATURE_FLAGS += -D'CONFIG_MEDIATEK_I2C_SPI=1' PROGRAMMER_OBJS += mediatek_i2c_spi.o +ACTIVE_PROGRAMMERS += mediatek_i2c_spi endif ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes) FEATURE_FLAGS += -D'CONFIG_REALTEK_MST_I2C_SPI=1' PROGRAMMER_OBJS += realtek_mst_i2c_spi.o +ACTIVE_PROGRAMMERS += realtek_mst_i2c_spi endif ifeq ($(CONFIG_DUMMY), yes) FEATURE_FLAGS += -D'CONFIG_DUMMY=1' PROGRAMMER_OBJS += dummyflasher.o +ACTIVE_PROGRAMMERS += dummyflasher endif ifeq ($(CONFIG_DRKAISER), yes) FEATURE_FLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o +ACTIVE_PROGRAMMERS += drkaiser endif ifeq ($(CONFIG_NICREALTEK), yes) FEATURE_FLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o +ACTIVE_PROGRAMMERS += nicrealtek endif ifeq ($(CONFIG_NICNATSEMI), yes) FEATURE_FLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o +ACTIVE_PROGRAMMERS += nicnatsemi endif ifeq ($(CONFIG_NICINTEL), yes) FEATURE_FLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o +ACTIVE_PROGRAMMERS += nicintel endif ifeq ($(CONFIG_NICINTEL_SPI), yes) FEATURE_FLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o +ACTIVE_PROGRAMMERS += nicintel_spi endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) FEATURE_FLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o +ACTIVE_PROGRAMMERS += nicintel_eeprom endif ifeq ($(CONFIG_OGP_SPI), yes) FEATURE_FLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o +ACTIVE_PROGRAMMERS += ogp_spi endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) FEATURE_FLAGS += -D'CONFIG_BUSPIRATE_SPI=1' PROGRAMMER_OBJS += buspirate_spi.o +ACTIVE_PROGRAMMERS += buspirate_spi endif ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_FLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o +ACTIVE_PROGRAMMERS += dediprog endif ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) FEATURE_FLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' PROGRAMMER_OBJS += developerbox_spi.o +ACTIVE_PROGRAMMERS += developerbox_spi endif ifeq ($(CONFIG_SATAMV), yes) FEATURE_FLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o +ACTIVE_PROGRAMMERS += satamv endif ifeq ($(CONFIG_LINUX_MTD), yes) FEATURE_FLAGS += -D'CONFIG_LINUX_MTD=1' PROGRAMMER_OBJS += linux_mtd.o +ACTIVE_PROGRAMMERS += linux_mtd endif ifeq ($(CONFIG_LINUX_SPI), yes) FEATURE_FLAGS += -D'CONFIG_LINUX_SPI=1' PROGRAMMER_OBJS += linux_spi.o +ACTIVE_PROGRAMMERS += linux_spi endif ifeq ($(CONFIG_MSTARDDC_SPI), yes) FEATURE_FLAGS += -D'CONFIG_MSTARDDC_SPI=1' PROGRAMMER_OBJS += mstarddc_spi.o +ACTIVE_PROGRAMMERS += mstarddc_spi endif ifeq ($(CONFIG_CH341A_SPI), yes) FEATURE_FLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o +ACTIVE_PROGRAMMERS += ch341a_spi endif ifeq ($(CONFIG_DIGILENT_SPI), yes) FEATURE_FLAGS += -D'CONFIG_DIGILENT_SPI=1' PROGRAMMER_OBJS += digilent_spi.o +ACTIVE_PROGRAMMERS += digilent_spi endif ifeq ($(CONFIG_DIRTYJTAG_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_DIRTYJTAG_SPI=1' PROGRAMMER_OBJS += dirtyjtag_spi.o +ACTIVE_PROGRAMMERS += dirtyjtag_spi endif ifeq ($(CONFIG_JLINK_SPI), yes) FEATURE_FLAGS += -D'CONFIG_JLINK_SPI=1' PROGRAMMER_OBJS += jlink_spi.o +ACTIVE_PROGRAMMERS += jlink_spi endif ifeq ($(CONFIG_NI845X_SPI), yes) FEATURE_FLAGS += -D'CONFIG_NI845X_SPI=1' PROGRAMMER_OBJS += ni845x_spi.o +ACTIVE_PROGRAMMERS += ni845x_spi endif USE_BITBANG_SPI := $(if $(call filter_deps,$(DEPENDS_ON_BITBANG_SPI)),yes,no) @@ -976,6 +1017,10 @@ @# Add the man page change date and version to the man page @sed -e 's#.TH FLASHROM 8 .*#.TH FLASHROM 8 "$(MAN_DATE)" "$(VERSION)" "$(MAN_DATE)"#' <$< >$@ +$(PROGRAM).bash: util/$(PROGRAM).bash-completion.tmpl + @# Add to the bash completion file a list of enabled programmers. + sed -e 's/@PROGRAMMERS@/$(ACTIVE_PROGRAMMERS)/g' <$< >$@ + strip: $(PROGRAM)$(EXEC_SUFFIX) $(STRIP) $(STRIP_ARGS) $(PROGRAM)$(EXEC_SUFFIX) @@ -984,14 +1029,16 @@ # We don't use EXEC_SUFFIX here because we want to clean everything. clean: rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o platform/*.d platform/*.o)) \ - $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) + $(PROGRAM).8 $(PROGRAM).8.html $(PROGRAM).bash $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean -install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 +install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 $(PROGRAM).bash mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(MANDIR)/man8 + mkdir -p $(DESTDIR)$(BASHCOMPDIR) $(INSTALL) -m 0755 $(PROGRAM)$(EXEC_SUFFIX) $(DESTDIR)$(PREFIX)/sbin $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL) -m 0644 $(PROGRAM).bash $(DESTDIR)$(BASHCOMPDIR) libinstall: libflashrom.a include/libflashrom.h mkdir -p $(DESTDIR)$(PREFIX)/lib diff --git a/meson.build b/meson.build index 27a284e..36cb4f8 100644 --- a/meson.build +++ b/meson.build @@ -630,6 +630,41 @@ subdir('util/ich_descriptors_tool') endif +if get_option('bash_completion').auto() or get_option('bash_completion').enabled() + if get_option('classic_cli').disabled() + if get_option('bash_completion').enabled() + error('`bash_completion` can not be enabled without `classic_cli`') + endif + else + bash_comp = dependency('bash-completion', required : false) + if bash_comp.found() + bash_comp_install_dir = bash_comp.get_variable( + pkgconfig : 'completionsdir', + pkgconfig_define : ['datadir', get_option('datadir')] + ) + else + bash_comp_install_dir = join_paths(get_option('datadir'), 'bash-completion', 'completions') + endif + + programmer_names_active_str = '' + foreach p_name, p_data : programmer + if p_data.get('active') + programmer_names_active_str += p_name + ' ' + endif + endforeach + + configure_file( + input : 'util/flashrom.bash-completion.tmpl', + output : 'flashrom.bash', + configuration : { + 'PROGRAMMERS' : programmer_names_active_str, + }, + install: true, + install_dir: bash_comp_install_dir, + ) + endif +endif + # Use `.auto() or .enabled()` instead of `.allowed()` to keep the minimum meson version as low as possible. # `.allowed()` gets introduced in 0.59.0 if get_option('tests').auto() or get_option('tests').enabled() diff --git a/meson_options.txt b/meson_options.txt index 1990d0a..9dcebdc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,7 @@ option('default_programmer_name', type : 'string', description : 'default programmer') option('default_programmer_args', type : 'string', description : 'default programmer arguments') option('ich_descriptors_tool', type : 'feature', value : 'auto', description : 'Build ich_descriptors_tool') +option('bash_completion', type : 'feature', value : 'auto', description : 'Install bash completion') option('tests', type : 'feature', value : 'auto', description : 'Build unit tests') option('use_internal_dmi', type : 'boolean', value : 'true') option('programmer', type : 'array', value : ['auto'], choices : [ diff --git a/util/flashrom.bash-completion.tmpl b/util/flashrom.bash-completion.tmpl new file mode 100644 index 0000000..afb7ae9 --- /dev/null +++ b/util/flashrom.bash-completion.tmpl @@ -0,0 +1,77 @@ +# Completion file for bash +# +# This file is part of the flashrom project. +# +# Copyright 2022 Alexander Goncharov <chat(a)joursoir.net> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +_flashrom() +{ + local cur prev OPTS + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + case $prev in + '-r'|'--read'|'-w'|'--write'|'-v'|'--verify'|'-l'|'--layout'| \ + '--fmap-file'|'-o'|'--output'|'--flash-contents') + local IFS=$'\n' + compopt -o filenames + COMPREPLY=( $(compgen -f -- $cur) ) + return 0 + ;; + '-c'|'--chip'|'--wp-range'|'--wp-region'|'-i'|'--include') + return 0 + ;; + '-p'|'--programmer') + COMPREPLY=( $(compgen -W "@PROGRAMMERS@" -- $cur) ) + return 0 + ;; + '-h'|'--help'|'-R'|'--version'|'-L'|'--list-supported') + return 0 + ;; + esac + OPTS="--help + --version + --read + --write + --verify + --erase + --verbose + --chip + --force + --noverify + --noverify-all + --extract + --layout + --wp-disable + --wp-enable + --wp-list + --wp-status + --wp-range + --wp-region + --flash-name + --flash-size + --fmap + --fmap-file + --ifd + --include + --output + --flash-contents + --list-supported + --progress + --programmer" + COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) ) + return 0 +} + +complete -F _flashrom flashrom -- To view, visit https://review.coreboot.org/c/flashrom/+/68247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Gerrit-Change-Number: 68247 Gerrit-PatchSet: 13 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: tests: Fix warnings for 32-bit Linux
by Anastasia Klimchuk (Code Review) 18 Jan '23

18 Jan '23

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/72038 ) Change subject: tests: Fix warnings for 32-bit Linux ...................................................................... tests: Fix warnings for 32-bit Linux Unit tests had int-to-pointer-cast warnings for 32-bit Linux environment, and since warnings are treated as errors this failed build with unit tests. Ticket: https://ticket.coreboot.org/issues/407 Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Tested-By: Branden Waldner <scruffy99(a)gmail.com> Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/72038 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> --- M tests/linux_spi.c 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Alexander Goncharov: Looks good to me, but someone else must approve diff --git a/tests/linux_spi.c b/tests/linux_spi.c index 1009634..1b653fe 100644 --- a/tests/linux_spi.c +++ b/tests/linux_spi.c @@ -23,14 +23,14 @@ /* First message has write array and write count */ unsigned int writecnt = msg[0].len; - unsigned char *writearr = (unsigned char *)msg[0].tx_buf; + unsigned char *writearr = (unsigned char *)(uintptr_t)msg[0].tx_buf; /* Second message has read array and read count */ unsigned int readcnt = msg[1].len; /* Detect probing */ if (writecnt == 1 && writearr[0] == JEDEC_RDID && readcnt == 3) { /* We need to populate read array. */ - unsigned char *readarr = (unsigned char *)msg[1].rx_buf; + unsigned char *readarr = (unsigned char *)(uintptr_t)msg[1].rx_buf; readarr[0] = 0xEF; /* WINBOND_NEX_ID */ readarr[1] = 0x40; /* WINBOND_NEX_W25Q128_V left byte */ readarr[2] = 0x18; /* WINBOND_NEX_W25Q128_V right byte */ -- To view, visit https://review.coreboot.org/c/flashrom/+/72038 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Gerrit-Change-Number: 72038 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Branden Waldner <scruffy99(a)gmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: tree/: Change chip restore data type from uint8_t to void ptr
by Anastasia Klimchuk (Code Review) 18 Jan '23

18 Jan '23

Attention is currently required from: Nikolai Artemiev. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/70349 ) Change subject: tree/: Change chip restore data type from uint8_t to void ptr ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/70349 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I311b468a4b0349f4da9584c12b36af6ec2394527 Gerrit-Change-Number: 70349 Gerrit-PatchSet: 9 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Wed, 18 Jan 2023 20:25:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit January 2023