October 2021 - flashrom-gerrit

Change in flashrom[master]: Makefile: meson.build: remove unused CONFIG_I2C_SUPPORT
by Nico Huber (Code Review) 26 Oct '21

26 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58495 ) Change subject: Makefile: meson.build: remove unused CONFIG_I2C_SUPPORT ...................................................................... Makefile: meson.build: remove unused CONFIG_I2C_SUPPORT CONFIG_I2C_SUPPORT has no mention in the source code. No need to pass it to the compiler. Change-Id: I2e19335e1b8d39f44dda14edc0a496dda6bc8c9c Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58495 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M Makefile M meson.build 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/Makefile b/Makefile index b03ab7c..0b60de2 100644 --- a/Makefile +++ b/Makefile @@ -738,7 +738,6 @@ ifeq ($(CONFIG_LINUX_I2C_HELPER), yes) LIB_OBJS += i2c_helper_linux.o -FEATURE_CFLAGS += -D'CONFIG_I2C_SUPPORT=1' endif ifneq ($(NEED_SERIAL), ) diff --git a/meson.build b/meson.build index 86657ce..85f40ba 100644 --- a/meson.build +++ b/meson.build @@ -342,7 +342,6 @@ if host_machine.system() == 'linux' srcs += 'i2c_helper_linux.c' - cargs += '-DCONFIG_I2C_SUPPORT=1' endif # raw memory, MSR or PCI port I/O access 4 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/+/58495 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2e19335e1b8d39f44dda14edc0a496dda6bc8c9c Gerrit-Change-Number: 58495 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.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, ich_descriptors_tool/Makefile: unify behavior
by Nico Huber (Code Review) 26 Oct '21

26 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58468 ) Change subject: Makefile, ich_descriptors_tool/Makefile: unify behavior ...................................................................... Makefile, ich_descriptors_tool/Makefile: unify behavior ich_descriptors_tool/Makefile: have the same behavior as the main flashrom Makefile - only set gcc explicit on MinGW HOST_OS - don't fallback to gcc if CC was not set - set CFLAGS and EXEC_SUFFIX for TARGET_OS, not for HOST_OS Change-Id: I353c3de250167994a4aea1edfef57d839e900d78 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58468 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M util/ich_descriptors_tool/Makefile 2 files changed, 8 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index e8bf8fc..b03ab7c 100644 --- a/Makefile +++ b/Makefile @@ -854,7 +854,7 @@ all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 ifeq ($(ARCH), x86) - @+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX) + @+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS) endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index 168220c..7f5814f 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -18,24 +18,19 @@ SRC = $(wildcard *.c) -CC ?= gcc - # If the user has specified custom CFLAGS, all CFLAGS settings below will be # completely ignored by gnumake. CFLAGS ?= -Os -Wall -Wshadow +# Auto determine HOST_OS and TARGET_OS if they are not set as argument HOST_OS ?= $(shell uname) +TARGET_OS := $(call c_macro_test, ../../Makefile.d/os_test.h) + ifeq ($(findstring MINGW, $(HOST_OS)), MINGW) # Explicitly set CC = gcc on MinGW, otherwise: "cc: command not found". CC = gcc -EXEC_SUFFIX := .exe -# Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that -# for MinGW. See http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/ */ -FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 endif -override TARGET_OS := $(call c_macro_test, ../../Makefile.d/os_test.h) - ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. @@ -43,6 +38,9 @@ endif ifeq ($(TARGET_OS), MinGW) +EXEC_SUFFIX := .exe +# Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that +# for MinGW. See http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/ CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 endif @@ -73,6 +71,7 @@ $(PROGRAM)$(EXEC_SUFFIX): $(OBJ) $(SHAREDOBJ) $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJ) $(SHAREDOBJ) +# We don't use EXEC_SUFFIX here because we want to clean everything. clean: rm -f $(PROGRAM) $(PROGRAM).exe rm -rf $(DEPPATH) $(OBJATH) -- To view, visit https://review.coreboot.org/c/flashrom/+/58468 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I353c3de250167994a4aea1edfef57d839e900d78 Gerrit-Change-Number: 58468 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.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: move utsname and clock_tettime test to the top
by Paul Menzel (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58618 ) Change subject: Makefile: move utsname and clock_tettime test to the top ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58618/comment/0e6e6853_75b20fab PS1, Line 9: Cleanup Clean up -- To view, visit https://review.coreboot.org/c/flashrom/+/58618 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie1f43b3d5a8ad79bff3f9bbc21f359ec35abc42a Gerrit-Change-Number: 58618 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.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-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: Tue, 26 Oct 2021 11:40:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: move c compiler check to the top
by Paul Menzel (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58616 ) Change subject: Makefile: move c compiler check to the top ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58616/comment/b46ea4cc_2d7aa315 PS2, Line 9: Cleanup Verb is spelled with a space: Clean up. -- To view, visit https://review.coreboot.org/c/flashrom/+/58616 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d6f08ef030744c772b4ec0dc2c9e614fb90461d Gerrit-Change-Number: 58616 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.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: Tue, 26 Oct 2021 11:40:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: [RFC] writeprotect, cli_classic: create writeprotect foundation
by Anastasia Klimchuk (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons, Nikolai Artemiev. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58474 ) Change subject: [RFC] writeprotect, cli_classic: create writeprotect foundation ...................................................................... Patch Set 5: (1 comment) File writeprotect.c: PS3: > I don't understand what the point of `struct wp` is. […] The only reason I was thinking to temporarily keep struct wp, is to keep cli_classic compiling. So that _wp_ functions can be added one at a time, with implementation. At the end of the patch series there would be no struct wp, one way or the other. I thought this can be another approach on how to add one function at a time. -- To view, visit https://review.coreboot.org/c/flashrom/+/58474 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I67e9b31f86465e5a8f7d3def637198671ee818a8 Gerrit-Change-Number: 58474 Gerrit-PatchSet: 5 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: 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: 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Tue, 26 Oct 2021 11:25:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: move utsname and clock_tettime test to the top
by Thomas Heijligen (Code Review) 26 Oct '21

26 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58618 ) Change subject: Makefile: move utsname and clock_tettime test to the top ...................................................................... Makefile: move utsname and clock_tettime test to the top Cleanup the feature target by outsourcing the test to an own variable. This is in preparation for further changes. Change-Id: Ie1f43b3d5a8ad79bff3f9bbc21f359ec35abc42a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile A Makefile.d/clock_gettime_test.c A Makefile.d/utsname_test.c M Makefile.include 4 files changed, 29 insertions(+), 47 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/58618/1 diff --git a/Makefile b/Makefile index 4120546..279feae 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,9 @@ override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h) +HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) +HAS_CLOCK_GETTIME := $(call c_compile_test, Makefile.d/clock_gettime_test.c) + ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include override LDFLAGS += -L/usr/local/lib @@ -843,13 +846,17 @@ CLI_OBJS += print_wiki.o endif -FEATURE_CFLAGS += $(call debug_shell,grep -q "UTSNAME := yes" .features && printf "%s" "-D'HAVE_UTSNAME=1'") - # We could use PULLED_IN_LIBS, but that would be ugly. FEATURE_LIBS += $(call debug_shell,grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz") -FEATURE_CFLAGS += $(call debug_shell,grep -q "CLOCK_GETTIME := yes" .features && printf "%s" "-D'HAVE_CLOCK_GETTIME=1'") -FEATURE_LIBS += $(call debug_shell,grep -q "CLOCK_GETTIME := yes" .features && printf "%s" "-lrt") +ifeq ($(HAS_UTSNAME), yes) +FEATURE_CFLAGS += -D'HAVE_UTSNAME=1' +endif + +ifeq ($(HAS_CLOCK_GETTIME), yes) +FEATURE_CFLAGS += -D'HAVE_CLOCK_GETTIME=1' +FEATURE_LIBS += -lrt +endif LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) @@ -1061,24 +1068,8 @@ exit 1; }; } \ 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 endif - @printf "Checking for utsname support... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$UTSNAME_TEST" > .featuretest.c - @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE) - @ { $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >&2 && \ - ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ - ( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) } 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE) - @printf "Checking for clock_gettime support... " | tee -a $(BUILD_DETAILS_FILE) -ifeq ($(DISABLE_CLOCK_GETTIME), yes) - @ { ( echo "disabled."; echo "CLOCK_GETTIME := no" >>.features.tmp ) } \ - 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE) -else - @echo "$$CLOCK_GETTIME_TEST" >.featuretest.c - @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -lrt .featuretest.c -o .featuretest$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE) - @ { $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -lrt .featuretest.c -o .featuretest$(EXEC_SUFFIX) >&2 && \ - ( echo "found."; echo "CLOCK_GETTIME := yes" >>.features.tmp ) || \ - ( echo "not found."; echo "CLOCK_GETTIME := no" >>.features.tmp ) } \ - 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE) -endif + @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" + @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features @rm -f .featuretest.c .featuretest$(EXEC_SUFFIX) diff --git a/Makefile.d/clock_gettime_test.c b/Makefile.d/clock_gettime_test.c new file mode 100644 index 0000000..f86f822 --- /dev/null +++ b/Makefile.d/clock_gettime_test.c @@ -0,0 +1,7 @@ +#include <time.h> +int main(int argc, char **argv) +{ + struct timespec res; + clock_gettime(CLOCK_REALTIME, &res); + return 0; +} diff --git a/Makefile.d/utsname_test.c b/Makefile.d/utsname_test.c new file mode 100644 index 0000000..a19fe5c --- /dev/null +++ b/Makefile.d/utsname_test.c @@ -0,0 +1,9 @@ +#include <sys/utsname.h> +struct utsname osinfo; +int main(int argc, char **argv) +{ + (void) argc; + (void) argv; + uname (&osinfo); + return 0; +} diff --git a/Makefile.include b/Makefile.include index 2b5a344..0ea1234 100644 --- a/Makefile.include +++ b/Makefile.include @@ -130,19 +130,6 @@ endef export FTDI_232H_TEST -define UTSNAME_TEST -#include <sys/utsname.h> -struct utsname osinfo; -int main(int argc, char **argv) -{ - (void) argc; - (void) argv; - uname (&osinfo); - return 0; -} -endef -export UTSNAME_TEST - define LINUX_MTD_TEST #include <mtd/mtd-user.h> @@ -181,18 +168,6 @@ endef export LINUX_I2C_TEST -define CLOCK_GETTIME_TEST -#include <time.h> - -int main(int argc, char **argv) -{ - struct timespec res; - clock_gettime(CLOCK_REALTIME, &res); - return 0; -} -endef -export CLOCK_GETTIME_TEST - define NI845X_TEST #include <ni845x.h> -- To view, visit https://review.coreboot.org/c/flashrom/+/58618 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie1f43b3d5a8ad79bff3f9bbc21f359ec35abc42a Gerrit-Change-Number: 58618 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: move c compiler check to the top
by Thomas Heijligen (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Angel Pons. Hello Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/58616 to look at the new patch set (#2). Change subject: Makefile: move c compiler check to the top ...................................................................... Makefile: move c compiler check to the top Cleanup the compiler target by outsourcing the test to an own variable. This is in preparation for further changes. Change-Id: I3d6f08ef030744c772b4ec0dc2c9e614fb90461d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile A Makefile.d/cc_test.c M Makefile.include 3 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/58616/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58616 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d6f08ef030744c772b4ec0dc2c9e614fb90461d Gerrit-Change-Number: 58616 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: Makefile: unify the look of TARGET_* prints
by Thomas Heijligen (Code Review) 26 Oct '21

26 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58617 ) Change subject: Makefile: unify the look of TARGET_* prints ...................................................................... Makefile: unify the look of TARGET_* prints Change-Id: I69959c20aa2e43ed67b3057c37e964a34cdab136 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile 1 file changed, 6 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/17/58617/1 diff --git a/Makefile b/Makefile index c09e9cf..4120546 100644 --- a/Makefile +++ b/Makefile @@ -895,17 +895,15 @@ @if [ $(CC_WORKING) = yes ]; \ then echo $$($(CC) --version 2>/dev/null | head -1); \ else echo no; echo Aborting.; exit 1; fi - @echo Target arch is $(ARCH) + @echo "Target arch: $(ARCH)" @if [ $(ARCH) = unknown ]; then echo Aborting.; exit 1; fi - @echo Target OS is $(TARGET_OS) + @echo "Target OS: $(TARGET_OS)" @if [ $(TARGET_OS) = unknown ]; then echo Aborting.; exit 1; fi - @echo Target endian is $(ENDIAN) + @if [ $(TARGET_OS) = libpayload ] && $(CC) --version 2>&1 | grep -q -v coreboot; then \ + echo " Warning: It seems you are not using coreboot's reference compiler."; \ + echo " This might work but usually does not, please beware."; fi + @echo "Target endian: $(ENDIAN)" @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi -ifeq ($(TARGET_OS), libpayload) - @$(CC) --version 2>&1 | grep -q coreboot || \ - ( echo "Warning: It seems you are not using coreboot's reference compiler."; \ - echo "This might work but usually does not, please beware." ) -endif hwlibs: compiler @printf "" > .libdeps -- To view, visit https://review.coreboot.org/c/flashrom/+/58617 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I69959c20aa2e43ed67b3057c37e964a34cdab136 Gerrit-Change-Number: 58617 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: Makefile: move c compiler check to the top
by Thomas Heijligen (Code Review) 26 Oct '21

26 Oct '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58616 ) Change subject: Makefile: move c compiler check to the top ...................................................................... Makefile: move c compiler check to the top Cleanup the compiler target by outsourcing the test to an own variable. This is in preparation for further changes. Change-Id: I3d6f08ef030744c772b4ec0dc2c9e614fb90461d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile A Makefile.d/cc_test.c M Makefile.include 3 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/58616/1 diff --git a/Makefile b/Makefile index e8bf8fc..c09e9cf 100644 --- a/Makefile +++ b/Makefile @@ -158,6 +158,8 @@ CC = gcc endif +CC_WORKING := $(call c_compile_test, Makefile.d/cc_test.c) + # Determine the destination OS, architecture and endian # IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN # is ever used (of course), but should come after any lines setting CC because @@ -889,13 +891,10 @@ # to environment variables and are referenced with $$<varname> later compiler: featuresavailable - @printf "Checking for a C compiler... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$COMPILER_TEST" > .test.c - @printf "\nexec: %s\n" "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX)" >>$(BUILD_DETAILS_FILE) - @{ { { { { $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX) >&2 && \ - echo "found." || { echo "not found."; \ - rm -f .test.c .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 - @rm -f .test.c .test$(EXEC_SUFFIX) + @echo -n "C compiler found: " + @if [ $(CC_WORKING) = yes ]; \ + then echo $$($(CC) --version 2>/dev/null | head -1); \ + else echo no; echo Aborting.; exit 1; fi @echo Target arch is $(ARCH) @if [ $(ARCH) = unknown ]; then echo Aborting.; exit 1; fi @echo Target OS is $(TARGET_OS) diff --git a/Makefile.d/cc_test.c b/Makefile.d/cc_test.c new file mode 100644 index 0000000..69e48e9 --- /dev/null +++ b/Makefile.d/cc_test.c @@ -0,0 +1,6 @@ +int main(int argc, char **argv) +{ + (void) argc; + (void) argv; + return 0; +} \ No newline at end of file diff --git a/Makefile.include b/Makefile.include index ca70d05..2b5a344 100644 --- a/Makefile.include +++ b/Makefile.include @@ -36,15 +36,9 @@ $(strip $(shell $(CC) -E $1 2>/dev/null | tail -1 | tr -d '"')) endef -define COMPILER_TEST -int main(int argc, char **argv) -{ - (void) argc; - (void) argv; - return 0; -} +define c_compile_test +$(shell $(CC) -c -Wall -Werror -o /dev/null $1 2>/dev/null && echo yes || echo no) endef -export COMPILER_TEST define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */ -- To view, visit https://review.coreboot.org/c/flashrom/+/58616 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d6f08ef030744c772b4ec0dc2c9e614fb90461d Gerrit-Change-Number: 58616 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Rename flash context in chip tests to flashctx
by Angel Pons (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58596 ) Change subject: tests: Rename flash context in chip tests to flashctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58596 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3f4d9c4fe85752e16bab71ad22b0135a96cac28a Gerrit-Change-Number: 58596 Gerrit-PatchSet: 1 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: 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 26 Oct 2021 08:56:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021