- flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: Move get_layout() from flashrom.c to layout.c
by David Hendricks (Code Review) 04 Sep '17

04 Sep '17

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/21367 Change subject: Move get_layout() from flashrom.c to layout.c ...................................................................... Move get_layout() from flashrom.c to layout.c Change-Id: Ic67cf53abddc0aa905674acbcde717d9aed2f66e Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- M flashrom.c M layout.c M layout.h 3 files changed, 12 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/21367/1 diff --git a/flashrom.c b/flashrom.c index c600efc..7a3d9bf 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1529,14 +1529,6 @@ return 0; } -static const struct flashrom_layout *get_layout(const struct flashctx *const flashctx) -{ - if (flashctx->layout && flashctx->layout->num_entries) - return flashctx->layout; - else - return &flashctx->fallback_layout.base; -} - /** * @brief Reads the included layout regions into a buffer. * diff --git a/layout.c b/layout.c index 9bf0b03..c416ec8 100644 --- a/layout.c +++ b/layout.c @@ -40,6 +40,14 @@ return &layout; } +const struct flashrom_layout *get_layout(const struct flashctx *const flashctx) +{ + if (flashctx->layout && flashctx->layout->num_entries) + return flashctx->layout; + else + return &flashctx->fallback_layout.base; +} + #ifndef __LIBPAYLOAD__ int read_romlayout(const char *name) { diff --git a/layout.h b/layout.h index f32dc82..3f78ced 100644 --- a/layout.h +++ b/layout.h @@ -28,6 +28,9 @@ #include <stddef.h> #include <stdint.h> +struct flashrom_flashctx; +#define flashctx flashrom_flashctx /* TODO: Agree on a name and convert all occurences. */ + /* Types and macros regarding the maximum flash space size supported by generic code. */ typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ typedef uint32_t chipsize_t; /* Able to store the number of bytes of any supported flash memory. */ @@ -58,6 +61,7 @@ }; struct flashrom_layout *get_global_layout(void); +const struct flashrom_layout *get_layout(const struct flashctx *const flashctx); int process_include_args(struct flashrom_layout *); -- To view, visit https://review.coreboot.org/21367 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newchange Gerrit-Change-Id: Ic67cf53abddc0aa905674acbcde717d9aed2f66e Gerrit-Change-Number: 21367 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>

1 0

Change in flashrom[staging]: layout: Add -i <region>[:<file>] support.
by build bot (Jenkins) (Code Review) 04 Sep '17

04 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19342 ) Change subject: layout: Add -i <region>[:<file>] support. ...................................................................... Patch Set 6: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/536/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/486/ : SUCCESS -- To view, visit https://review.coreboot.org/19342 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 03 Sep 2017 23:20:40 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Hack up test_v2.sh to work better with upstream
by build bot (Jenkins) (Code Review) 04 Sep '17

04 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19341 ) Change subject: Hack up test_v2.sh to work better with upstream ...................................................................... Patch Set 6: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/535/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/485/ : SUCCESS -- To view, visit https://review.coreboot.org/19341 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I9ace99fdb8d779804fe1887fe49f6409f8aff02e Gerrit-Change-Number: 19341 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 03 Sep 2017 23:20:39 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: make args for -r/-w/-v non-positional and optional
by build bot (Jenkins) (Code Review) 04 Sep '17

04 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19387 ) Change subject: make args for -r/-w/-v non-positional and optional ...................................................................... Patch Set 4: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/537/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/487/ : SUCCESS -- To view, visit https://review.coreboot.org/19387 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Iefbcb7dc4fefe26f5afd1292dfd5c1687fa62803 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 4 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Louis Yung-Chieh Lo <yjlou(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 03 Sep 2017 23:20:14 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: test_v2.sh: Copy layout to local tempdir in local-layout mode
by build bot (Jenkins) (Code Review) 04 Sep '17

04 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19406 ) Change subject: test_v2.sh: Copy layout to local tempdir in local-layout mode ...................................................................... Patch Set 4: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/534/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/484/ : SUCCESS -- To view, visit https://review.coreboot.org/19406 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Ia2328d367ee3df5ac1c481c16e4502a81d69fd98 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 4 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 03 Sep 2017 23:19:48 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Copy test_v2 directory from chromiumos branch
by build bot (Jenkins) (Code Review) 04 Sep '17

04 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19340 ) Change subject: Copy test_v2 directory from chromiumos branch ...................................................................... Patch Set 6: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/533/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/483/ : SUCCESS -- To view, visit https://review.coreboot.org/19340 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I41bef98d32df61af400ecac46ea9571e722b2ac6 Gerrit-Change-Number: 19340 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 03 Sep 2017 23:19:47 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Copy test_v2 directory from chromiumos branch
by David Hendricks (Code Review) 04 Sep '17

04 Sep '17

Hello Paul Menzel, build bot (Jenkins), Patrick Georgi, I'd like you to reexamine a change. Please visit https://review.coreboot.org/19340 to look at the new patch set (#6). Change subject: Copy test_v2 directory from chromiumos branch ...................................................................... Copy test_v2 directory from chromiumos branch This is a straight copy and should not be merged. The full patch series will eventually be imported, but for now this is just a hack to get stuff working. Change-Id: I41bef98d32df61af400ecac46ea9571e722b2ac6 Signed-off-by: David Hendricks <dhendricks(a)fb.com> --- A tests/tests_v2/cmd.sh A tests/tests_v2/servo_hooks.sh A tests/tests_v2/test_v2.sh 3 files changed, 1,371 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/19340/6 -- To view, visit https://review.coreboot.org/19340 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newpatchset Gerrit-Change-Id: I41bef98d32df61af400ecac46ea9571e722b2ac6 Gerrit-Change-Number: 19340 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: layout: Add -i <region>[:<file>] support.
by David Hendricks (Code Review) 04 Sep '17

04 Sep '17

Hello Carl-Daniel Hailfinger, Philippe Mathieu-Daudé, Paul Menzel, build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/19342 to look at the new patch set (#6). Change subject: layout: Add -i <region>[:<file>] support. ...................................................................... layout: Add -i <region>[:<file>] support. Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files. This is a rebase of a patch that was ported from chromiumos. A lot of things have changed, but the idea is the same. Original patch by Louis Yung-Chieh Lo <yjlou(a)chromium.org>: Summary: Support -i partition:file feature for both read and write. Commit: 9c7525f Review URL: http://codereview.chromium.org/6611015 Ported version by Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> and Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>: Summary: [PATCH 2/6] layout: Add -i <region>[:<file>] support. Review URL: https://mail.coreboot.org/pipermail/flashrom/2013-October/011729.html Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- M cli_classic.c M dummyflasher.c M flash.h M flashrom.8.tmpl M flashrom.c M layout.c M layout.h 7 files changed, 147 insertions(+), 32 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/42/19342/6 -- To view, visit https://review.coreboot.org/19342 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Gerrit-Change-Number: 19342 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: make args for -r/-w/-v non-positional and optional
by David Hendricks (Code Review) 04 Sep '17

04 Sep '17

Hello Louis Yung-Chieh Lo, Paul Menzel, build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/19387 to look at the new patch set (#4). Change subject: make args for -r/-w/-v non-positional and optional ...................................................................... make args for -r/-w/-v non-positional and optional Ported from chromiumos: https://chromium-review.googlesource.com/#/c/60515/ This makes a filename following -r, -w, and -v operations non- positional. The first argument that does not begin with a hyphen (-) is the filename for -r/-w/-v. If no such argument exists, then -r/-w/-v options apply to files specified for individually included regions via -i. This has a few side-effects: 1. It allows us to omit the ROM-sized filename entirely when a filename is provided for a particular region when using -i. For example, "flashrom -i FOO:foo.bin -r". 2. It allows, for better or worse, the filename be specified anywhere on the command line after the program name. Our scripts and docs should still specify the file after -r/-w/-v for clarity. For our purposes, if a filename is given for every included region (-i region:filename) then the user does not need to specify a filename after -r/-w/-v. However, if any -i option does not specify a filename, then a file must be specified after -r/-w/-v. The syntax will be backwards compatible for now so that one can still mix -i options with and without the added filename specifier for each region. BUG=chromium:263495 BRANCH=none TEST=manual (see notes below) 1. Write random data to RW_UNUSED region (on snow in this case) without requiring an argument to -w. See that only RW_UNUSED is erased and written, and that verify works: dd if=/dev/urandom of=rw_unused.bin bs=1k count=1 conv=notrunc flashrom -p host -i RW_UNUSED:rw_unused.bin -w -V flashrom -p host -i RW_UNUSED:rw_unused.bin -v -V 2. Same as above, but specify a dummy file to test syntax backwards compatibility: dd if=/dev/urandom of=rw_unused.bin bs=1k count=1 conv=notrunc dd if=/dev/urandom of=random_4M.bin bs=1M count=4 flashrom -p host -i RW_UNUSED:rw_unused.bin -w random_4M.bin -V flashrom -p host -i RW_UNUSED:rw_unused.bin -v random_4M.bin -V 3. Test that dumping RW_UNUSED and GBB regions without -r arg dumps two files and that they can be used to verify the content: flashrom -p host -i RW_UNUSED:rw_unused.bin -i GBB:gbb.bin -r flashrom -p host -i RW_UNUSED:rw_unused.bin -i GBB:gbb.bin -v 4. Same as above, but with dummy file: flashrom -p host -i RW_UNUSED:rw_unused.bin -i GBB:gbb.bin -r x.bin flashrom -p host -i RW_UNUSED:rw_unused.bin -i GBB:gbb.bin -v x.bin Change-Id: Iefbcb7dc4fefe26f5afd1292dfd5c1687fa62803 Reviewed-on: https://gerrit.chromium.org/gerrit/60515 Reviewed-by: Yung-Chieh Lo <yjlou(a)chromium.org> Commit-Queue: David Hendricks <dhendrix(a)chromium.org> Tested-by: David Hendricks <dhendrix(a)chromium.org> --- M cli_classic.c M flashrom.c M layout.c M layout.h 4 files changed, 217 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/87/19387/4 -- To view, visit https://review.coreboot.org/19387 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iefbcb7dc4fefe26f5afd1292dfd5c1687fa62803 Gerrit-Change-Number: 19387 Gerrit-PatchSet: 4 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Louis Yung-Chieh Lo <yjlou(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: .gitignore: Add Doxygen dir `libflashrom-doc/`
by Nico Huber (Code Review) 03 Sep '17

03 Sep '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/20811 ) Change subject: .gitignore: Add Doxygen dir `libflashrom-doc/` ...................................................................... .gitignore: Add Doxygen dir `libflashrom-doc/` Change-Id: Id25d05cdf6107cc7a99b94a8523e23bd8698c2d6 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/20811 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 19a4365..2d621dc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /flashrom-* /flashrom.exe /flashrom.8 +/libflashrom-doc/ /util/ich_descriptors_tool/ich_descriptors_tool /util/ich_descriptors_tool/ich_descriptors_tool.exe -- To view, visit https://review.coreboot.org/20811 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: Id25d05cdf6107cc7a99b94a8523e23bd8698c2d6 Gerrit-Change-Number: 20811 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit