October 2021 - flashrom-gerrit

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

26 Oct '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber 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: (3 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/58618/comment/9f890e3f_5a91f71f PS1, Line 7: move `Rework`? https://review.coreboot.org/c/flashrom/+/58618/comment/a92584ea_d3e1c144 PS1, Line 7: tet *g*ettime File Makefile.d/utsname_test.c: https://review.coreboot.org/c/flashrom/+/58618/comment/36b0fcc3_29cc0753 PS1, Line 7: Drop spurious spaces? -- 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: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 26 Oct 2021 12:34:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

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

26 Oct '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58617 ) Change subject: Makefile: unify the look of TARGET_* prints ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/58617/comment/0d0cba1c_4fa0610b PS2, Line 7: Makefile: unify the look of TARGET_* prints Unify with what? File Makefile: https://review.coreboot.org/c/flashrom/+/58617/comment/a48ba5bf_68e977fb PS2, Line 902: @if [ $(TARGET_OS) = libpayload ] && $(CC) --version 2>&1 | grep -q -v coreboot; then \ `grep -v` looks for any non-matching line -- 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: 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: 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-Comment-Date: Tue, 26 Oct 2021 12:30:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Introduce include directory for header files
by Felix Singer (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Nico Huber, Thomas Heijligen. Hello Nico Huber, Thomas Heijligen, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/58622 to look at the new patch set (#2). Change subject: Introduce include directory for header files ...................................................................... Introduce include directory for header files Introduce the directory `src/include` and move all header files into it. Also, adjust the buildsystem so that the directory is known. Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Signed-off-by: Felix Singer <felix.singer(a)secunet.com> --- M Makefile M meson.build R src/include/chipdrivers.h R src/include/coreboot_tables.h R src/include/custom_baud.h R src/include/edi.h R src/include/ene.h R src/include/flash.h R src/include/flashchips.h R src/include/fmap.h R src/include/hwaccess.h R src/include/hwaccess_x86_io.h R src/include/i2c_helper.h R src/include/ich_descriptors.h R src/include/layout.h R src/include/libflashrom.h R src/include/programmer.h R src/include/spi.h R src/include/usb_device.h R src/include/writeprotect.h M util/ich_descriptors_tool/Makefile M util/ich_descriptors_tool/meson.build 22 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/58622/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58622 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Gerrit-Change-Number: 58622 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: Introduce include directory for header files
by Felix Singer (Code Review) 26 Oct '21

26 Oct '21

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58622 ) Change subject: Introduce include directory for header files ...................................................................... Introduce include directory for header files Introduce the directory `src/include` and move all header files into it. Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Signed-off-by: Felix Singer <felix.singer(a)secunet.com> --- M Makefile M meson.build R src/include/chipdrivers.h R src/include/coreboot_tables.h R src/include/custom_baud.h R src/include/edi.h R src/include/ene.h R src/include/flash.h R src/include/flashchips.h R src/include/fmap.h R src/include/hwaccess.h R src/include/hwaccess_x86_io.h R src/include/i2c_helper.h R src/include/ich_descriptors.h R src/include/layout.h R src/include/libflashrom.h R src/include/programmer.h R src/include/spi.h R src/include/usb_device.h R src/include/writeprotect.h M util/ich_descriptors_tool/Makefile M util/ich_descriptors_tool/meson.build 22 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/58622/1 diff --git a/Makefile b/Makefile index be1d59c..d4faff6 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings +CPPFLAGS += -I src/include EXPORTDIR ?= . RANLIB ?= ranlib PKG_CONFIG ?= pkg-config diff --git a/meson.build b/meson.build index 85f40ba..589b2ed 100644 --- a/meson.build +++ b/meson.build @@ -367,7 +367,7 @@ mandir = join_paths(prefix, get_option('mandir')) install_headers([ - 'libflashrom.h', + 'src/include/libflashrom.h', ], ) @@ -410,6 +410,7 @@ sources : [ srcs, ], + include_directories : include_directories('src/include'), soversion : lt_current, version : lt_version, dependencies : [ @@ -480,6 +481,7 @@ 'cli_output.c', 'flashrom.c', ], + include_directories : include_directories('src/include'), dependencies : [ deps, ], @@ -499,13 +501,13 @@ required: false ) flashrom_test_dep = declare_dependency( - include_directories : include_directories('.'), sources : [ srcs, 'cli_common.c', 'cli_output.c', 'flashrom.c', ], + include_directories : include_directories('src/include'), compile_args : [ '-includestdlib.h', '-includeunittest_env.h', diff --git a/chipdrivers.h b/src/include/chipdrivers.h similarity index 100% rename from chipdrivers.h rename to src/include/chipdrivers.h diff --git a/coreboot_tables.h b/src/include/coreboot_tables.h similarity index 100% rename from coreboot_tables.h rename to src/include/coreboot_tables.h diff --git a/custom_baud.h b/src/include/custom_baud.h similarity index 100% rename from custom_baud.h rename to src/include/custom_baud.h diff --git a/edi.h b/src/include/edi.h similarity index 100% rename from edi.h rename to src/include/edi.h diff --git a/ene.h b/src/include/ene.h similarity index 100% rename from ene.h rename to src/include/ene.h diff --git a/flash.h b/src/include/flash.h similarity index 100% rename from flash.h rename to src/include/flash.h diff --git a/flashchips.h b/src/include/flashchips.h similarity index 100% rename from flashchips.h rename to src/include/flashchips.h diff --git a/fmap.h b/src/include/fmap.h similarity index 100% rename from fmap.h rename to src/include/fmap.h diff --git a/hwaccess.h b/src/include/hwaccess.h similarity index 100% rename from hwaccess.h rename to src/include/hwaccess.h diff --git a/hwaccess_x86_io.h b/src/include/hwaccess_x86_io.h similarity index 100% rename from hwaccess_x86_io.h rename to src/include/hwaccess_x86_io.h diff --git a/i2c_helper.h b/src/include/i2c_helper.h similarity index 100% rename from i2c_helper.h rename to src/include/i2c_helper.h diff --git a/ich_descriptors.h b/src/include/ich_descriptors.h similarity index 100% rename from ich_descriptors.h rename to src/include/ich_descriptors.h diff --git a/layout.h b/src/include/layout.h similarity index 100% rename from layout.h rename to src/include/layout.h diff --git a/libflashrom.h b/src/include/libflashrom.h similarity index 100% rename from libflashrom.h rename to src/include/libflashrom.h diff --git a/programmer.h b/src/include/programmer.h similarity index 100% rename from programmer.h rename to src/include/programmer.h diff --git a/spi.h b/src/include/spi.h similarity index 100% rename from spi.h rename to src/include/spi.h diff --git a/usb_device.h b/src/include/usb_device.h similarity index 100% rename from usb_device.h rename to src/include/usb_device.h diff --git a/writeprotect.h b/src/include/writeprotect.h similarity index 100% rename from writeprotect.h rename to src/include/writeprotect.h diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index 7f5814f..44f3120 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -21,6 +21,7 @@ # If the user has specified custom CFLAGS, all CFLAGS settings below will be # completely ignored by gnumake. CFLAGS ?= -Os -Wall -Wshadow +CPPFLAGS += -I $(SHAREDSRCDIR)/src/include # Auto determine HOST_OS and TARGET_OS if they are not set as argument HOST_OS ?= $(shell uname) diff --git a/util/ich_descriptors_tool/meson.build b/util/ich_descriptors_tool/meson.build index b5bf09e..9e59309 100644 --- a/util/ich_descriptors_tool/meson.build +++ b/util/ich_descriptors_tool/meson.build @@ -4,10 +4,10 @@ 'ich_descriptors_tool.c', '../../ich_descriptors.c', ], + include_directories : include_directories('../../src/include'), dependencies : [ deps, ], - include_directories : include_directories('../..'), c_args : [ '-DICH_DESCRIPTORS_FROM_DUMP_ONLY', ], -- To view, visit https://review.coreboot.org/c/flashrom/+/58622 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Gerrit-Change-Number: 58622 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

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

26 Oct '21

Attention is currently required from: Nico Huber, Angel Pons. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58617 ) Change subject: Makefile: unify the look of TARGET_* prints ...................................................................... Patch Set 2: (1 comment) File Makefile: https://review.coreboot.org/c/flashrom/+/58617/comment/89d022bb_8b8bc90a PS2, Line 902: @if [ $(TARGET_OS) = libpayload ] && $(CC) --version 2>&1 | grep -q -v coreboot; then \ @if [ $(TARGET_OS) = libpayload ] && ! $(CC) --version 2>&1 | grep -q coreboot; then \ -- 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: 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: 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 26 Oct 2021 12:25:22 +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 Nico Huber (Code Review) 26 Oct '21

26 Oct '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber 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 (4 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/58616/comment/4b5cf8fe_0e315d74 PS2, Line 7: Makefile: move c compiler check to the top It's doing much more, how about: Makefile: Revise C compiler check https://review.coreboot.org/c/flashrom/+/58616/comment/7da04216_e6996102 PS2, Line 10: It's also changing the output, e.g. prints version, and doesn't write into the build-details file. That's ok but should be mentioned. File Makefile: https://review.coreboot.org/c/flashrom/+/58616/comment/ae36b1ad_57b932e8 PS2, Line 896: echo $$( Redirection through `echo` seems unnecessary. File Makefile.d/cc_test.c: https://review.coreboot.org/c/flashrom/+/58616/comment/bbdcb324_416251fb PS2, Line 4: We could remove the spurious space after the casts while we are at it. -- 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: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 26 Oct 2021 12:20:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: remove NEED_LIBUSB1 from FEATURE_CFLAGS
by Nico Huber (Code Review) 26 Oct '21

26 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58518 ) Change subject: Makefile: remove NEED_LIBUSB1 from FEATURE_CFLAGS ...................................................................... Makefile: remove NEED_LIBUSB1 from FEATURE_CFLAGS NEED_LIBUSB1 is not used outside of the Makefile. No need to pass it to the compiler. Change-Id: Ie7cb3df39daf22cb954186d38ba32812b05d92f9 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58518 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 1 file changed, 0 insertions(+), 1 deletion(-) 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 0b60de2..be1d59c 100644 --- a/Makefile +++ b/Makefile @@ -801,7 +801,6 @@ NEED_LIBUSB1 := $(call filter_deps,$(DEPENDS_ON_LIBUSB1)) ifneq ($(NEED_LIBUSB1), ) CHECK_LIBUSB1 = yes -FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' PROGRAMMER_OBJS += usbdev.o usb_device.o # FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD DragonFlyBSD)) 3 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/+/58518 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie7cb3df39daf22cb954186d38ba32812b05d92f9 Gerrit-Change-Number: 58518 Gerrit-PatchSet: 6 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: 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

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021