- flashrom-gerrit - mail.coreboot.org

[XS] Change in flashrom[main]: Makefile: CONFIG_INTERNAL depends on raw mem access
by Peter Marheine (Code Review) 30 Nov '23

30 Nov '23

Peter Marheine has submitted this change. ( https://review.coreboot.org/c/flashrom/+/78930?usp=email ) Change subject: Makefile: CONFIG_INTERNAL depends on raw mem access ...................................................................... Makefile: CONFIG_INTERNAL depends on raw mem access CONFIG_INTERNAL depends on raw mem access resulting in the following build failure on sh4 since version 1.3.0: /home/thomas/autobuild/instance-3/output-1/per-package/flashrom/host/bin/../lib/gcc/sh4a-buildroot-linux-gnu/12.3.0/../../../../sh4a-buildroot-linux-gnu/bin/ld: libflashrom.a(internal.o): in function `internal_chip_readn': internal.c:(.text+0x8): undefined reference to `mmio_readn' Fixes the build raised by buildroot autobuilders with the following options: - CONFIG_FT2232_SPI=no - CONFIG_USBBLASTER_SPI=no - CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes - CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes Here is the target information: C compiler found: sh4a-buildroot-linux-gnu-gcc.br_real (Buildroot 2022.08-rc1-5515-gf1a47904b63) 12.3.0 Target arch: sh Target OS: Linux Target endian: little Full build log: - http://autobuild.buildroot.org/results/f74a9d315fb519f284428234713f43fcf4e3… Change-Id: I7610f5f7cc5b114ffa90d5752155acc8b6b7c9f7 Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/78930 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> --- M Makefile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Peter Marheine: Looks good to me, approved build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved Alexander Goncharov: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index ae37d17..7b1312d 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,7 @@ CONFIG_ATAPROMISE \ CONFIG_DRKAISER \ CONFIG_GFXNVIDIA \ + CONFIG_INTERNAL \ CONFIG_INTERNAL_X86 \ CONFIG_IT8212 \ CONFIG_NICINTEL \ -- To view, visit https://review.coreboot.org/c/flashrom/+/78930?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I7610f5f7cc5b114ffa90d5752155acc8b6b7c9f7 Gerrit-Change-Number: 78930 Gerrit-PatchSet: 3 Gerrit-Owner: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[main]: buspirate_spi: Add support for hiz output with pullups=off
by Dreg (Code Review) 29 Nov '23

29 Nov '23

Attention is currently required from: Anastasia Klimchuk, Thomas Heijligen. Hello Anastasia Klimchuk, Thomas Heijligen, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/79299?usp=email to look at the new patch set (#2). Change subject: buspirate_spi: Add support for hiz output with pullups=off ...................................................................... buspirate_spi: Add support for hiz output with pullups=off When working with low-voltage chips, the internal 10k pull-ups of the Bus Pirate might be too high. In such cases, it's necessary to create an external pull-up using lower-value resistors. For this, you can use the ``hiz`` parameter. This way, the Bus Pirate will operate as an open drain Change-Id: I6d9909b23782ef3fcb1428fd127dae0d6b211855 Signed-off-by: David Reguera Garcia <dreg(a)rootkit.es> --- M buspirate_spi.c M doc/classic_cli_manpage.rst 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/79299/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/79299?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I6d9909b23782ef3fcb1428fd127dae0d6b211855 Gerrit-Change-Number: 79299 Gerrit-PatchSet: 2 Gerrit-Owner: Dreg <dreg(a)fr33project.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Dreg <dreg(a)fr33project.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: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[main]: Add Idaville platform into chipset enable list and add update IRC reg...
by Kevin Yu (Code Review) 29 Nov '23

29 Nov '23

Kevin Yu has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/79336?usp=email ) Change subject: Add Idaville platform into chipset enable list and add update IRC region support ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/flashrom/+/79336?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Id66e75e969bb4a1c32032a51a38071a8c339235f Gerrit-Change-Number: 79336 Gerrit-PatchSet: 2 Gerrit-Owner: Kevin Yu <ykevin(a)celestica.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: abandon

1 0

[XS] Change in flashrom[main]: Makefile: CONFIG_INTERNAL depends on raw mem access
by Alexander Goncharov (Code Review) 29 Nov '23

29 Nov '23

Attention is currently required from: Fabrice Fontaine, Thomas Heijligen. Alexander Goncharov has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/78930?usp=email ) Change subject: Makefile: CONFIG_INTERNAL depends on raw mem access ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/78930?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I7610f5f7cc5b114ffa90d5752155acc8b6b7c9f7 Gerrit-Change-Number: 78930 Gerrit-PatchSet: 2 Gerrit-Owner: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(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: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Gerrit-Comment-Date: Wed, 29 Nov 2023 10:22:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[main]: buspirate_spi: Add support for hiz output with pullups=off
by Dreg (Code Review) 29 Nov '23

29 Nov '23

Attention is currently required from: Anastasia Klimchuk, Thomas Heijligen. Dreg has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/79299?usp=email ) Change subject: buspirate_spi: Add support for hiz output with pullups=off ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/79299?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I6d9909b23782ef3fcb1428fd127dae0d6b211855 Gerrit-Change-Number: 79299 Gerrit-PatchSet: 1 Gerrit-Owner: Dreg <dreg(a)fr33project.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Dreg <dreg(a)fr33project.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: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 29 Nov 2023 08:24:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[main]: Add Idaville platform into chipset enable list and add update IRC reg...
by Kevin Yu (Code Review) 29 Nov '23

29 Nov '23

Kevin Yu has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/79336?usp=email ) Change subject: Add Idaville platform into chipset enable list and add update IRC region support ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Hi Anastasia I have define "iRCexists" flash.h, but why I still got iRCexists undefine. -- To view, visit https://review.coreboot.org/c/flashrom/+/79336?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Id66e75e969bb4a1c32032a51a38071a8c339235f Gerrit-Change-Number: 79336 Gerrit-PatchSet: 2 Gerrit-Owner: Kevin Yu <ykevin(a)celestica.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 29 Nov 2023 07:26:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[main]: Add Idaville platform into chipset enable list and add update IRC reg...
by Kevin Yu (Code Review) 29 Nov '23

29 Nov '23

Kevin Yu has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/79336?usp=email ) Change subject: Add Idaville platform into chipset enable list and add update IRC region support ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://review.coreboot.org/c/flashrom/+/79336?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Id66e75e969bb4a1c32032a51a38071a8c339235f Gerrit-Change-Number: 79336 Gerrit-PatchSet: 2 Gerrit-Owner: Kevin Yu <ykevin(a)celestica.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 29 Nov 2023 07:14:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[XS] Change in flashrom[main]: Add Idaville platform into chipset enable list
by Kevin Yu (Code Review) 29 Nov '23

29 Nov '23

Kevin Yu has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/79285?usp=email ) Change subject: Add Idaville platform into chipset enable list ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/flashrom/+/79285?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I3e77dab58e497ac6a1cbbb1c536c53544c1eef55 Gerrit-Change-Number: 79285 Gerrit-PatchSet: 1 Gerrit-Owner: Kevin Yu <ykevin(a)celestica.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

[M] Change in flashrom[main]: Add Idaville platform into chipset enable list and add update IRC reg...
by Anastasia Klimchuk (Code Review) 29 Nov '23

29 Nov '23

Attention is currently required from: Kevin Yu. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/79287?usp=email ) Change subject: Add Idaville platform into chipset enable list and add update IRC region support ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Kevin, thanks for the patch! First of all, have a look at the build failure: click the link from Jenkins and open console output. There is something there: ichspi.c:1364:17: error: this 'else' clause does not guard... [-Werror=misleading- indentation] 1364 | else | ^~~~ ichspi.c:1368:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else' 1368 | prettyprint_ich9_reg_hsfs(hsfs, ich_gen); | -- To view, visit https://review.coreboot.org/c/flashrom/+/79287?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I15bb3bb368156b078547ce0bdea556c7ab87f729 Gerrit-Change-Number: 79287 Gerrit-PatchSet: 1 Gerrit-Owner: Kevin Yu <ykevin(a)celestica.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Kevin Yu <ykevin(a)celestica.com> Gerrit-Comment-Date: Wed, 29 Nov 2023 02:26:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[main]: Remove dependency on C23 __has_include()
by Anastasia Klimchuk (Code Review) 29 Nov '23

29 Nov '23

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/77089?usp=email ) Change subject: Remove dependency on C23 __has_include() ...................................................................... Remove dependency on C23 __has_include() Use build system to check header presence: * getopt.h (from include/cli_classic.h) * pciutils/pci.h (from include/platform/pci.h) Tested with <getopt.h> and <pci/pci.h> using GNU Make 4.1, 4.2.1, 4.4.1 and Meson 0.56.0, 1.2.1 against GCC 13.2.1 and GCC 5.5-, 7.3-compatible (EDG 4.14-, 5.1-based) on openSuSE Tumbleweed and a custom LFS distro. Change-Id: Ic544963ffd29626ae0a21bdddb1c78850cc43ec6 Signed-off-by: Anton Samsonov <devel(a)zxlab.ru> Reviewed-on: https://review.coreboot.org/c/flashrom/+/77089 Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile A Makefile.d/getopt_test.c A Makefile.d/pciutils_test.c M include/cli_classic.h M include/platform/pci.h M meson.build 6 files changed, 38 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Alexander Goncharov: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/Makefile b/Makefile index bf01d0f..ae37d17 100644 --- a/Makefile +++ b/Makefile @@ -242,6 +242,7 @@ HAS_LIBUSB1 := $(call find_dependency, libusb-1.0) HAS_LIBPCI := $(call find_dependency, libpci) +HAS_GETOPT := $(call c_compile_test, Makefile.d/getopt_test.c) HAS_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS)) HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) HAS_CLOCK_GETTIME := $(call c_compile_test, Makefile.d/clock_gettime_test.c) @@ -249,6 +250,7 @@ HAS_LINUX_MTD := $(call c_compile_test, Makefile.d/linux_mtd_test.c) HAS_LINUX_SPI := $(call c_compile_test, Makefile.d/linux_spi_test.c) HAS_LINUX_I2C := $(call c_compile_test, Makefile.d/linux_i2c_test.c) +HAS_PCIUTILS := $(call c_compile_test, Makefile.d/pciutils_test.c) HAS_SERIAL := $(strip $(if $(filter $(TARGET_OS), DOS libpayload), no, yes)) HAS_SPHINXBUILD := $(shell command -v $(SPHINXBUILD) >/dev/null 2>/dev/null && echo yes || echo no) EXEC_SUFFIX := $(strip $(if $(filter $(TARGET_OS), DOS MinGW), .exe)) @@ -945,6 +947,14 @@ endif endif +ifeq ($(HAS_GETOPT), yes) +override CFLAGS += -D'HAVE_GETOPT_H=1' +endif + +ifeq ($(HAS_PCIUTILS), yes) +override CFLAGS += -D'HAVE_PCIUTILS_PCI_H=1' +endif + OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) @@ -994,11 +1004,13 @@ echo " CFLAGS: $(CONFIG_LIBFTDI1_CFLAGS)"; \ echo " LDFLAGS: $(CONFIG_LIBFTDI1_LDFLAGS)"; \ fi + @echo "Checking for header \"getopt.h\": $(HAS_GETOPT)" @echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)" @echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)" @echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" + @echo "Checking for header \"pciutils/pci.h\": $(HAS_PCIUTILS)" @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" @echo "Checking for external \"librt\": $(HAS_EXTERN_LIBRT)" @if ! [ "$(PROGRAMMER_OBJS)" ]; then \ diff --git a/Makefile.d/getopt_test.c b/Makefile.d/getopt_test.c new file mode 100644 index 0000000..9f72608 --- /dev/null +++ b/Makefile.d/getopt_test.c @@ -0,0 +1,8 @@ +#include <getopt.h> + +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + return 0; +} diff --git a/Makefile.d/pciutils_test.c b/Makefile.d/pciutils_test.c new file mode 100644 index 0000000..3d67c29 --- /dev/null +++ b/Makefile.d/pciutils_test.c @@ -0,0 +1,8 @@ +#include <pciutils/pci.h> + +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + return 0; +} diff --git a/include/cli_classic.h b/include/cli_classic.h index e651cc6..eb1f0fe 100644 --- a/include/cli_classic.h +++ b/include/cli_classic.h @@ -15,7 +15,7 @@ #ifndef CLI_CLASSIC_H #define CLI_CLASSIC_H -#if __has_include(<getopt.h>) +#ifdef HAVE_GETOPT_H #include <getopt.h> #else @@ -39,5 +39,5 @@ int getopt_long_only (int argc, char *const *argv, const char *shortopts, const struct option *longopts, int *longind); -#endif /* __has_include() */ +#endif /* HAVE_GETOPT_H */ #endif /* CLI_CLASSIC_H */ diff --git a/include/platform/pci.h b/include/platform/pci.h index 4ac108f..6abde59 100644 --- a/include/platform/pci.h +++ b/include/platform/pci.h @@ -22,10 +22,10 @@ * e.g. NetBSD 9.0 on sparc64 pciutils-3.7.0nb2. * Other NetBSD platforms and versions uses the default path under pci/pci.h */ -#if __has_include(<pciutils/pci.h>) +#ifdef HAVE_PCIUTILS_PCI_H #include <pciutils/pci.h> #else #include <pci/pci.h> -#endif +#endif /* HAVE_PCIUTILS_PCI_H */ #endif /* __PLATFORM_PCI_H__ */ diff --git a/meson.build b/meson.build index c85fdf4..7c46de4 100644 --- a/meson.build +++ b/meson.build @@ -114,6 +114,12 @@ if cc.has_function('strnlen') add_project_arguments('-DHAVE_STRNLEN=1', language : 'c') endif +if cc.check_header('getopt.h') + add_project_arguments('-DHAVE_GETOPT_H=1', language : 'c') +endif +if cc.check_header('pciutils/pci.h') + add_project_arguments('-DHAVE_PCIUTILS_PCI_H=1', language : 'c') +endif if cc.check_header('sys/utsname.h') add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') endif -- To view, visit https://review.coreboot.org/c/flashrom/+/77089?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Ic544963ffd29626ae0a21bdddb1c78850cc43ec6 Gerrit-Change-Number: 77089 Gerrit-PatchSet: 7 Gerrit-Owner: Anton Samsonov <devel(a)zxlab.ru> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anton Samsonov <avscomputing(a)gmail.com> Gerrit-CC: Anton Samsonov <contact-launchpad(a)zxlab.ru> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit