January 2022 - flashrom-gerrit

Change in flashrom[master]: tests: test write protection
by Anastasia Klimchuk (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Nico Huber, Nikolai Artemiev, Sergii Dmytruk. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/59075 ) Change subject: tests: test write protection ...................................................................... Patch Set 27: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/59075 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I49af7f6d173eb4c56c22d80b01a473b8c499c0f8 Gerrit-Change-Number: 59075 Gerrit-PatchSet: 27 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:59:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: cli_classic.c: Convert do_erase() to libflashrom call
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Edward O'Callaghan, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60068 ) Change subject: cli_classic.c: Convert do_erase() to libflashrom call ...................................................................... Patch Set 4: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/60068/comment/b47b409d_47e15c5f PS4, Line 12: closer to cli_classic as a pure libflashrom user. It does, but kind of by moving CLI code into libflashrom. do_erase() is practically CLI code, it's just in the wrong file. Also, adding a FIXME to libflashrom doesn't look like progress. I guess the FIXME is the reason that the call is in CLI code. How about we just move it into `cli_classic.c`? -- To view, visit https://review.coreboot.org/c/flashrom/+/60068 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8566164e7dbad69cf478b24208014f10fb99e4d0 Gerrit-Change-Number: 60068 Gerrit-PatchSet: 4 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(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-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:50:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom: Convert do_read() into a libflashrom user
by Anastasia Klimchuk (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Nico Huber, Edward O'Callaghan. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60430 ) Change subject: flashrom: Convert do_read() into a libflashrom user ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/60430 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id2addadb891c482ee3f69da806062d7a88776675 Gerrit-Change-Number: 60430 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(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-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:31:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom: Convert do_read() into a libflashrom user
by Edward O'Callaghan (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Nico Huber. Hello build bot (Jenkins), Nico Huber, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/60430 to look at the new patch set (#3). Change subject: flashrom: Convert do_read() into a libflashrom user ...................................................................... flashrom: Convert do_read() into a libflashrom user Aspire towards a goal of making cli_classic more of just a user of libflashrom than having quasi-parallel paths in flashrom.c This converts the do_read() provider wrapper into a pure libflashrom user. BUG=b:208132085 TEST=`$ sudo ./flashrom -p internal -r /tmp/bios.bin` TEST=`$ sudo ./flashrom -p internal -l /tmp/layout -i FOO -r /tmp/foo.bin` Change-Id: Id2addadb891c482ee3f69da806062d7a88776675 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/60430/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/60430 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id2addadb891c482ee3f69da806062d7a88776675 Gerrit-Change-Number: 60430 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(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-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom.c: Make {read,write}_buf_from_include_args() public
by Edward O'Callaghan (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Daniel Campello, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60069 ) Change subject: flashrom.c: Make {read,write}_buf_from_include_args() public ...................................................................... Patch Set 3: (1 comment) File flash.h: https://review.coreboot.org/c/flashrom/+/60069/comment/7c7a9e2f_77bff3c3 PS3, Line 353: read_buf_from_include_args > That would add to the public API though so needs careful thought The layout/flashrom refactor would look something like this https://review.coreboot.org/c/flashrom/+/61286 but a bunch more work is needed for dealing with all the other *_by_layout() workers. -- To view, visit https://review.coreboot.org/c/flashrom/+/60069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d Gerrit-Change-Number: 60069 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:24:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: Move {read,write}_buf_from_include_args() to layout
by Edward O'Callaghan (Code Review) 20 Jan '22

20 Jan '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/61286 ) Change subject: flashrom.c: Move {read,write}_buf_from_include_args() to layout ...................................................................... flashrom.c: Move {read,write}_buf_from_include_args() to layout It makes more sense for these to be apart of layout.c. BUG=b:208132085 TEST=`make` Change-Id: I61d4460ea26e07b67c99baeae5cb3840c25cb913 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Spotted-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M flash.h M flashrom.c M layout.c M layout.h 4 files changed, 69 insertions(+), 68 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/61286/1 diff --git a/flash.h b/flash.h index e464dd4..391a2d4 100644 --- a/flash.h +++ b/flash.h @@ -350,9 +350,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); -int read_buf_from_include_args(const struct flashctx *const flash, unsigned char *buf); int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); -int write_buf_to_include_args(const struct flashctx *const flash, unsigned char *buf); int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it); void finalize_flash_access(struct flashctx *); int do_read(struct flashctx *, const char *filename); diff --git a/flashrom.c b/flashrom.c index c7adba8..ffe738b 100644 --- a/flashrom.c +++ b/flashrom.c @@ -920,43 +920,6 @@ } /** - * @brief Reads content to buffer from one or more files. - * - * Reads content to supplied buffer from files. If a filename is specified for - * individual regions using the partial read syntax ('-i <region>[:<filename>]') - * then this will read file data into the corresponding region in the - * supplied buffer. - * - * @param flashctx Flash context to be used. - * @param buf Chip-sized buffer to write data to - * @return 0 on success - */ -int read_buf_from_include_args(const struct flashctx *const flash, - unsigned char *buf) -{ - const struct flashrom_layout *const layout = get_layout(flash); - const struct romentry *entry = NULL; - - /* - * Content will be read from -i args, so they must not overlap since - * we need to know exactly what content to write to the ROM. - */ - if (included_regions_overlap(layout)) { - msg_gerr("Error: Included regions must not overlap when writing.\n"); - return 1; - } - - while ((entry = layout_next_included(layout, entry))) { - if (!entry->file) - continue; - if (read_buf_from_file(buf + entry->start, - entry->end - entry->start + 1, entry->file)) - return 1; - } - return 0; -} - -/** * @brief Writes passed data buffer into a file * * @param buf Buffer with data to write @@ -1017,35 +980,6 @@ } /** - * @brief Writes content from buffer to one or more files. - * - * Writes content from supplied buffer to files. If a filename is specified for - * individual regions using the partial read syntax ('-i <region>[:<filename>]') - * then this will write files using data from the corresponding region in the - * supplied buffer. - * - * @param flashctx Flash context to be used. - * @param buf Chip-sized buffer to read data from - * @return 0 on success - */ -int write_buf_to_include_args(const struct flashctx *const flash, - unsigned char *buf) -{ - const struct flashrom_layout *const layout = get_layout(flash); - const struct romentry *entry = NULL; - - while ((entry = layout_next_included(layout, entry))) { - if (!entry->file) - continue; - if (write_buf_to_file(buf + entry->start, - entry->end - entry->start + 1, entry->file)) - return 1; - } - - return 0; -} - -/** * @brief Reads the included layout regions into a buffer. * * If there is no layout set in the given flash context, the whole chip will diff --git a/layout.c b/layout.c index 05bee19..d33ac21 100644 --- a/layout.c +++ b/layout.c @@ -299,6 +299,72 @@ return ret; } +/** + * @brief Reads content to buffer from one or more files. + * + * Reads content to supplied buffer from files. If a filename is specified for + * individual regions using the partial read syntax ('-i <region>[:<filename>]') + * then this will read file data into the corresponding region in the + * supplied buffer. + * + * @param flashctx Flash context to be used. + * @param buf Chip-sized buffer to write data to + * @return 0 on success + */ +int read_buf_from_include_args(const struct flashrom_flashctx *const flash, + unsigned char *buf) +{ + const struct flashrom_layout *const layout = get_layout(flash); + const struct romentry *entry = NULL; + + /* + * Content will be read from -i args, so they must not overlap since + * we need to know exactly what content to write to the ROM. + */ + if (included_regions_overlap(layout)) { + msg_gerr("Error: Included regions must not overlap when writing.\n"); + return 1; + } + + while ((entry = layout_next_included(layout, entry))) { + if (!entry->file) + continue; + if (read_buf_from_file(buf + entry->start, + entry->end - entry->start + 1, entry->file)) + return 1; + } + return 0; +} + +/** + * @brief Writes content from buffer to one or more files. + * + * Writes content from supplied buffer to files. If a filename is specified for + * individual regions using the partial read syntax ('-i <region>[:<filename>]') + * then this will write files using data from the corresponding region in the + * supplied buffer. + * + * @param flashctx Flash context to be used. + * @param buf Chip-sized buffer to read data from + * @return 0 on success + */ +int write_buf_to_include_args(const struct flashrom_flashctx *const flash, + unsigned char *buf) +{ + const struct flashrom_layout *const layout = get_layout(flash); + const struct romentry *entry = NULL; + + while ((entry = layout_next_included(layout, entry))) { + if (!entry->file) + continue; + if (write_buf_to_file(buf + entry->start, + entry->end - entry->start + 1, entry->file)) + return 1; + } + + return 0; +} + void prepare_layout_for_extraction(struct flashctx *flash) { const struct flashrom_layout *const l = get_layout(flash); diff --git a/layout.h b/layout.h index abbdc22..5e41b89 100644 --- a/layout.h +++ b/layout.h @@ -59,6 +59,9 @@ int process_include_args(struct flashrom_layout *, const struct layout_include_args *); void cleanup_include_args(struct layout_include_args **); +int read_buf_from_include_args(const struct flashrom_flashctx *const flash, unsigned char *buf); +int write_buf_to_include_args(const struct flashrom_flashctx *const flash, unsigned char *buf); + const struct romentry *layout_next_included_region(const struct flashrom_layout *, chipoff_t); const struct romentry *layout_next_included(const struct flashrom_layout *, const struct romentry *); const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *); -- To view, visit https://review.coreboot.org/c/flashrom/+/61286 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I61d4460ea26e07b67c99baeae5cb3840c25cb913 Gerrit-Change-Number: 61286 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: flashrom.c: Make {read,write}_buf_from_include_args() public
by Edward O'Callaghan (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Daniel Campello, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60069 ) Change subject: flashrom.c: Make {read,write}_buf_from_include_args() public ...................................................................... Patch Set 3: (1 comment) File flash.h: https://review.coreboot.org/c/flashrom/+/60069/comment/15e49719_d9804f03 PS3, Line 353: read_buf_from_include_args > Then maybe libflashrom. […] That would add to the public API though so needs careful thought -- To view, visit https://review.coreboot.org/c/flashrom/+/60069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d Gerrit-Change-Number: 60069 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:19:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: Make {read,write}_buf_from_include_args() public
by Anastasia Klimchuk (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60069 ) Change subject: flashrom.c: Make {read,write}_buf_from_include_args() public ...................................................................... Patch Set 3: (1 comment) File flash.h: https://review.coreboot.org/c/flashrom/+/60069/comment/6a178741_26f42847 PS3, Line 353: read_buf_from_include_args > It's a good idea in theory but read_buf_from_file() [sic. […] Then maybe libflashrom.h? It has a bunch of layout-specific functions, and even flashrom_layout itself (at the bottom, starting from line 108). -- To view, visit https://review.coreboot.org/c/flashrom/+/60069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d Gerrit-Change-Number: 60069 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:16:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: remove obsolete distclean target
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59233 ) Change subject: Makefile: remove obsolete distclean target ...................................................................... Makefile: remove obsolete distclean target distclean removes .libdeps which does not exist anymore Change-Id: I7d5717b99bf44a610a77177662c208da7f58c9e7 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59233 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index ec8956a..d4de2ff 100644 --- a/Makefile +++ b/Makefile @@ -987,9 +987,6 @@ rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean -distclean: clean - rm -f .libdeps - install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(MANDIR)/man8 2 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/+/59233 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7d5717b99bf44a610a77177662c208da7f58c9e7 Gerrit-Change-Number: 59233 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: rename FEATURE_CFLAGS to FEATURE_FLAGS
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59231 ) Change subject: Makefile: rename FEATURE_CFLAGS to FEATURE_FLAGS ...................................................................... Makefile: rename FEATURE_CFLAGS to FEATURE_FLAGS Change-Id: I819f5d76e6f37a0e0ed6481a051ed85126622503 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59231 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 59 insertions(+), 59 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index f26f701..ec8956a 100644 --- a/Makefile +++ b/Makefile @@ -268,9 +268,9 @@ endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) -FEATURE_CFLAGS += -D'IS_WINDOWS=1' +FEATURE_FLAGS += -D'IS_WINDOWS=1' else -FEATURE_CFLAGS += -D'IS_WINDOWS=0' +FEATURE_FLAGS += -D'IS_WINDOWS=0' endif # FIXME: Should we check for Cygwin/MSVC as well? @@ -352,10 +352,10 @@ endif ifeq ($(ENDIAN), little) -FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' +FEATURE_FLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' endif ifeq ($(ENDIAN), big) -FEATURE_CFLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' +FEATURE_FLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' endif # PCI port I/O support is unimplemented on PPC/MIPS/SPARC and unavailable on ARM. @@ -373,21 +373,21 @@ endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Linux Darwin NetBSD OpenBSD)) -FEATURE_CFLAGS += -D'USE_IOPL=1' +FEATURE_FLAGS += -D'USE_IOPL=1' else -FEATURE_CFLAGS += -D'USE_IOPL=0' +FEATURE_FLAGS += -D'USE_IOPL=0' endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD FreeBSD-glibc DragonFlyBSD)) -FEATURE_CFLAGS += -D'USE_DEV_IO=1' +FEATURE_FLAGS += -D'USE_DEV_IO=1' else -FEATURE_CFLAGS += -D'USE_DEV_IO=0' +FEATURE_FLAGS += -D'USE_DEV_IO=0' endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Hurd)) -FEATURE_CFLAGS += -D'USE_IOPERM=1' +FEATURE_FLAGS += -D'USE_IOPERM=1' else -FEATURE_CFLAGS += -D'USE_IOPERM=0' +FEATURE_FLAGS += -D'USE_IOPERM=0' endif @@ -590,212 +590,212 @@ # Depending on the CONFIG_* variables set and verified above we set compiler flags and parameters below. ifdef CONFIG_DEFAULT_PROGRAMMER_NAME -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_$(CONFIG_DEFAULT_PROGRAMMER_NAME)' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_$(CONFIG_DEFAULT_PROGRAMMER_NAME)' else -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' endif -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' ifeq ($(CONFIG_INTERNAL), yes) -FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' +FEATURE_FLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o ifeq ($(ARCH), x86) PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o PROGRAMMER_OBJS += ichspi.o dmi.o ifeq ($(CONFIG_INTERNAL_DMI), yes) -FEATURE_CFLAGS += -D'CONFIG_INTERNAL_DMI=1' +FEATURE_FLAGS += -D'CONFIG_INTERNAL_DMI=1' endif else endif endif ifeq ($(CONFIG_SERPROG), yes) -FEATURE_CFLAGS += -D'CONFIG_SERPROG=1' +FEATURE_FLAGS += -D'CONFIG_SERPROG=1' PROGRAMMER_OBJS += serprog.o NEED_SERIAL += CONFIG_SERPROG NEED_POSIX_SOCKETS += CONFIG_SERPROG endif ifeq ($(CONFIG_RAYER_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' +FEATURE_FLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o endif ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1' +FEATURE_FLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1' PROGRAMMER_OBJS += raiden_debug_spi.o endif ifeq ($(CONFIG_PONY_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_PONY_SPI=1' +FEATURE_FLAGS += -D'CONFIG_PONY_SPI=1' PROGRAMMER_OBJS += pony_spi.o NEED_SERIAL += CONFIG_PONY_SPI endif ifeq ($(CONFIG_BITBANG_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_BITBANG_SPI=1' +FEATURE_FLAGS += -D'CONFIG_BITBANG_SPI=1' PROGRAMMER_OBJS += bitbang_spi.o endif ifeq ($(CONFIG_NIC3COM), yes) -FEATURE_CFLAGS += -D'CONFIG_NIC3COM=1' +FEATURE_FLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o endif ifeq ($(CONFIG_GFXNVIDIA), yes) -FEATURE_CFLAGS += -D'CONFIG_GFXNVIDIA=1' +FEATURE_FLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o endif ifeq ($(CONFIG_SATASII), yes) -FEATURE_CFLAGS += -D'CONFIG_SATASII=1' +FEATURE_FLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o endif ifeq ($(CONFIG_ATAHPT), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAHPT=1' +FEATURE_FLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o endif ifeq ($(CONFIG_ATAVIA), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' +FEATURE_FLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o endif ifeq ($(CONFIG_ATAPROMISE), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAPROMISE=1' +FEATURE_FLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o endif ifeq ($(CONFIG_IT8212), yes) -FEATURE_CFLAGS += -D'CONFIG_IT8212=1' +FEATURE_FLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o endif ifeq ($(CONFIG_FT2232_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_FT2232_SPI=1' +FEATURE_FLAGS += -D'CONFIG_FT2232_SPI=1' PROGRAMMER_OBJS += ft2232_spi.o endif ifeq ($(CONFIG_USBBLASTER_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_USBBLASTER_SPI=1' +FEATURE_FLAGS += -D'CONFIG_USBBLASTER_SPI=1' PROGRAMMER_OBJS += usbblaster_spi.o endif ifeq ($(CONFIG_PICKIT2_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_PICKIT2_SPI=1' +FEATURE_FLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o endif ifeq ($(CONFIG_STLINKV3_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_STLINKV3_SPI=1' +FEATURE_FLAGS += -D'CONFIG_STLINKV3_SPI=1' PROGRAMMER_OBJS += stlinkv3_spi.o endif ifeq ($(CONFIG_LSPCON_I2C_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_LSPCON_I2C_SPI=1' +FEATURE_FLAGS += -D'CONFIG_LSPCON_I2C_SPI=1' PROGRAMMER_OBJS += lspcon_i2c_spi.o endif ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_REALTEK_MST_I2C_SPI=1' +FEATURE_FLAGS += -D'CONFIG_REALTEK_MST_I2C_SPI=1' PROGRAMMER_OBJS += realtek_mst_i2c_spi.o endif ifeq ($(CONFIG_DUMMY), yes) -FEATURE_CFLAGS += -D'CONFIG_DUMMY=1' +FEATURE_FLAGS += -D'CONFIG_DUMMY=1' PROGRAMMER_OBJS += dummyflasher.o endif ifeq ($(CONFIG_DRKAISER), yes) -FEATURE_CFLAGS += -D'CONFIG_DRKAISER=1' +FEATURE_FLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o endif ifeq ($(CONFIG_NICREALTEK), yes) -FEATURE_CFLAGS += -D'CONFIG_NICREALTEK=1' +FEATURE_FLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o endif ifeq ($(CONFIG_NICNATSEMI), yes) -FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1' +FEATURE_FLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o endif ifeq ($(CONFIG_NICINTEL), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o endif ifeq ($(CONFIG_NICINTEL_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o endif ifeq ($(CONFIG_OGP_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' +FEATURE_FLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1' +FEATURE_FLAGS += -D'CONFIG_BUSPIRATE_SPI=1' PROGRAMMER_OBJS += buspirate_spi.o NEED_SERIAL += CONFIG_BUSPIRATE_SPI endif ifeq ($(CONFIG_DEDIPROG), yes) -FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' +FEATURE_FLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o endif ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' +FEATURE_FLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' PROGRAMMER_OBJS += developerbox_spi.o endif ifeq ($(CONFIG_SATAMV), yes) -FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' +FEATURE_FLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o endif ifeq ($(CONFIG_LINUX_MTD), yes) -FEATURE_CFLAGS += -D'CONFIG_LINUX_MTD=1' +FEATURE_FLAGS += -D'CONFIG_LINUX_MTD=1' PROGRAMMER_OBJS += linux_mtd.o endif ifeq ($(CONFIG_LINUX_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_LINUX_SPI=1' +FEATURE_FLAGS += -D'CONFIG_LINUX_SPI=1' PROGRAMMER_OBJS += linux_spi.o endif ifeq ($(CONFIG_MSTARDDC_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_MSTARDDC_SPI=1' +FEATURE_FLAGS += -D'CONFIG_MSTARDDC_SPI=1' PROGRAMMER_OBJS += mstarddc_spi.o endif ifeq ($(CONFIG_CH341A_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' +FEATURE_FLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o endif ifeq ($(CONFIG_DIGILENT_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_DIGILENT_SPI=1' +FEATURE_FLAGS += -D'CONFIG_DIGILENT_SPI=1' PROGRAMMER_OBJS += digilent_spi.o endif ifeq ($(CONFIG_JLINK_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_JLINK_SPI=1' +FEATURE_FLAGS += -D'CONFIG_JLINK_SPI=1' PROGRAMMER_OBJS += jlink_spi.o endif ifeq ($(CONFIG_NI845X_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_NI845X_SPI=1' +FEATURE_FLAGS += -D'CONFIG_NI845X_SPI=1' PROGRAMMER_OBJS += ni845x_spi.o endif @@ -825,7 +825,7 @@ USE_X86_PORT_IO := $(if $(call filter_deps,$(DEPENDS_ON_X86_PORT_IO)),yes,no) ifeq ($(USE_X86_PORT_IO), yes) -FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' +FEATURE_FLAGS += -D'__FLASHROM_HAVE_OUTB__=1' PROGRAMMER_OBJS += hwaccess_x86_io.o endif @@ -849,7 +849,7 @@ USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no) ifeq ($(USE_LIBPCI), yes) PROGRAMMER_OBJS += pcidev.o -FEATURE_CFLAGS += -D'NEED_PCI=1' +FEATURE_FLAGS += -D'NEED_PCI=1' override CFLAGS += $(CONFIG_LIBPCI_CFLAGS) override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS) endif @@ -866,7 +866,7 @@ override CFLAGS += $(CONFIG_LIBFTDI1_CFLAGS) override LDFLAGS += $(CONFIG_LIBFTDI1_LDFLAGS) ifeq ($(HAS_FT232H), yes) -FEATURE_CFLAGS += -D'HAVE_FT232H=1' +FEATURE_FLAGS += -D'HAVE_FT232H=1' endif endif @@ -883,16 +883,16 @@ endif ifeq ($(CONFIG_PRINT_WIKI), yes) -FEATURE_CFLAGS += -D'CONFIG_PRINT_WIKI=1' +FEATURE_FLAGS += -D'CONFIG_PRINT_WIKI=1' CLI_OBJS += print_wiki.o endif ifeq ($(HAS_UTSNAME), yes) -FEATURE_CFLAGS += -D'HAVE_UTSNAME=1' +FEATURE_FLAGS += -D'HAVE_UTSNAME=1' endif ifeq ($(HAS_CLOCK_GETTIME), yes) -FEATURE_CFLAGS += -D'HAVE_CLOCK_GETTIME=1' +FEATURE_FLAGS += -D'HAVE_CLOCK_GETTIME=1' override LDFLAGS += -lrt endif @@ -961,7 +961,7 @@ fi %.o: %.c config - $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< + $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_FLAGS) $(SCMDEF) -o $@ -c $< $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) 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/+/59231 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I819f5d76e6f37a0e0ed6481a051ed85126622503 Gerrit-Change-Number: 59231 Gerrit-PatchSet: 8 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit January 2022