December 2017 - flashrom-gerrit

Change in flashrom[master]: Do not stop probing for flashchips after map_flash() failed
by David Hendricks (Code Review) 11 Dec '17

11 Dec '17

David Hendricks has submitted this change and it was merged. ( https://review.coreboot.org/22685 ) Change subject: Do not stop probing for flashchips after map_flash() failed ...................................................................... Do not stop probing for flashchips after map_flash() failed Instead, continue probing the next chip. This fixes the problem that flashrom aborts probing for flashchips if one big flashchip (e.g. 32M/64M) can't be mapped because of activated CONFIG_STRICT_DEVMEM kernel option. Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Signed-off-by: Martin Schiller <ms(a)dev.tdt.de> Reviewed-on: https://review.coreboot.org/22685 Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashrom.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: David Hendricks: Looks good to me, but someone else must approve Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/flashrom.c b/flashrom.c index 4fe1843..12d7390 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1224,7 +1224,7 @@ flash->mst = mst; if (map_flash(flash) != 0) - return -1; + goto notfound; /* We handle a forced match like a real match, we just avoid probing. Note that probe_flash() * is only called with force=1 after normal probing failed. -- To view, visit https://review.coreboot.org/22685 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 3 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: Do not stop probing for flashchips after map_flash() failed
by David Hendricks (Code Review) 11 Dec '17

11 Dec '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22685 ) Change subject: Do not stop probing for flashchips after map_flash() failed ...................................................................... Patch Set 2: (1 comment) https://review.coreboot.org/#/c/22685/1//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/22685/1//COMMIT_MSG@7 PS1, Line 7: Do > Upper case `Do`, please. Done -- To view, visit https://review.coreboot.org/22685 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 11 Dec 2017 03:36:56 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[master]: Do not stop probing for flashchips after map_flash() failed
by build bot (Jenkins) (Code Review) 11 Dec '17

11 Dec '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22685 ) Change subject: Do not stop probing for flashchips after map_flash() failed ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/924/ : SUCCESS -- To view, visit https://review.coreboot.org/22685 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 11 Dec 2017 03:36:42 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: Do not stop probing for flashchips after map_flash() failed
by David Hendricks (Code Review) 11 Dec '17

11 Dec '17

Hello Stefan Tauner, Paul Menzel, build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/22685 to look at the new patch set (#2). Change subject: Do not stop probing for flashchips after map_flash() failed ...................................................................... Do not stop probing for flashchips after map_flash() failed Instead, continue probing the next chip. This fixes the problem that flashrom aborts probing for flashchips if one big flashchip (e.g. 32M/64M) can't be mapped because of activated CONFIG_STRICT_DEVMEM kernel option. Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Signed-off-by: Martin Schiller <ms(a)dev.tdt.de> --- M flashrom.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/22685/2 -- To view, visit https://review.coreboot.org/22685 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: flashchips: Mark W25Q128.W as tested
by build bot (Jenkins) (Code Review) 10 Dec '17

10 Dec '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22790 ) Change subject: flashchips: Mark W25Q128.W as tested ...................................................................... Patch Set 3: Build Successful https://qa.coreboot.org/job/flashrom-customrules/923/ : SUCCESS -- To view, visit https://review.coreboot.org/22790 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0ef331ad3b3a8ab05a9472f3053f76c0789b1f9 Gerrit-Change-Number: 22790 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 10 Dec 2017 00:13:17 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: flashchips: Mark W25Q128.W as tested
by Nico Huber (Code Review) 10 Dec '17

10 Dec '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/22790 ) Change subject: flashchips: Mark W25Q128.W as tested ...................................................................... flashchips: Mark W25Q128.W as tested Tested read, erase, and write using W25Q128FWSIG and Dediprog SF600. Change-Id: Id0ef331ad3b3a8ab05a9472f3053f76c0789b1f9 Signed-off-by: David Hendricks <dhendricks(a)fb.com> Reviewed-on: https://review.coreboot.org/22790 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/flashchips.c b/flashchips.c index a33b37e..749e96e 100644 --- a/flashchips.c +++ b/flashchips.c @@ -15054,7 +15054,7 @@ /* supports SFDP */ /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = -- To view, visit https://review.coreboot.org/22790 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id0ef331ad3b3a8ab05a9472f3053f76c0789b1f9 Gerrit-Change-Number: 22790 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: flashchips: Mark W25Q128.W as tested
by build bot (Jenkins) (Code Review) 10 Dec '17

10 Dec '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22790 ) Change subject: flashchips: Mark W25Q128.W as tested ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/804/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/922/ : SUCCESS -- To view, visit https://review.coreboot.org/22790 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0ef331ad3b3a8ab05a9472f3053f76c0789b1f9 Gerrit-Change-Number: 22790 Gerrit-PatchSet: 2 Gerrit-Owner: 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 10 Dec 2017 00:12:41 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: flashchips: Mark W25Q128.W as tested
by Nico Huber (Code Review) 09 Dec '17

09 Dec '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/22790 ) Change subject: flashchips: Mark W25Q128.W as tested ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/22790 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0ef331ad3b3a8ab05a9472f3053f76c0789b1f9 Gerrit-Change-Number: 22790 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 23:14:11 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Prepare for a single branch on gerrit
by build bot (Jenkins) (Code Review) 09 Dec '17

09 Dec '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22330 ) Change subject: Prepare for a single branch on gerrit ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/921/ : SUCCESS -- To view, visit https://review.coreboot.org/22330 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Gerrit-Change-Number: 22330 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 23:12:42 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Prepare for a single branch on gerrit
by Nico Huber (Code Review) 09 Dec '17

09 Dec '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/22330 ) Change subject: Prepare for a single branch on gerrit ...................................................................... Prepare for a single branch on gerrit Discourage all direct pushes to the upstream repositories, no matter the branch. Also, skip adding Change-Ids to fixup! and squash! commits. Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/22330 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- M util/git-hooks/commit-msg M util/git-hooks/pre-push 2 files changed, 7 insertions(+), 54 deletions(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved diff --git a/util/git-hooks/commit-msg b/util/git-hooks/commit-msg index b9217e0..811cced 100755 --- a/util/git-hooks/commit-msg +++ b/util/git-hooks/commit-msg @@ -44,11 +44,10 @@ return fi - # *Do* add Change-Id to temp commits (original code bails out here) - # if echo "$clean_message" | head -1 | grep -q '^$fixup\|squash$!' - # then - # return - # fi + if echo "$clean_message" | head -1 | grep -q '^$fixup\|squash$!' + then + return + fi if test "false" = "`git config --bool --get gerrit.createChangeId`" then diff --git a/util/git-hooks/pre-push b/util/git-hooks/pre-push index b5f4620..dcce264 100755 --- a/util/git-hooks/pre-push +++ b/util/git-hooks/pre-push @@ -19,57 +19,11 @@ remote="$1" url="$2" -zero=0000000000000000000000000000000000000000 - upstream_pattern="github\.com.flashrom/flashrom(\.git)?|flashrom\.org.git/flashrom(\.git)?" -# Only care about the upstream repositories -if echo "$url" | grep -q -v -E "$upstream_pattern" ; then - exit 0 +# We use gerrit only and don't want direct pushes +if echo "$url" | grep -q -E "$upstream_pattern" ; then + exit 1 fi - -while read local_ref local_sha remote_ref remote_sha ; do - - # Only allow the stable and staging branches as well as versioned stable branches (e.g., 0.0.x). - # The matching expression's RE is always anchored to the first character (^ is undefined). - # The outer parentheses are needed to print out the whole matched string. - version=$(expr ${remote_ref#*refs/heads/} : '$\([0-9]\+\.$\{2,\}x\)$') - if [ "$remote_ref" != "refs/heads/staging" ] && \ - [ "$remote_ref" != "refs/heads/stable" ] && \ - [ -z "$version" ]; then - echo "Feature branches not allowed ($remote_ref)." >&2 - exit 1 - fi - - if [ "$local_sha" = $zero ]; then - echo "Deletion of branches is prohibited." >&2 - exit 1 - fi - - # Check for Signed-off-by and Acked-by - commit=$(git rev-list -n 1 --all-match --invert-grep -E \ - --grep '^Signed-off-by: .+ <.+@.+\..+>$' \ - --grep '^Acked-by: .+ <.+@.+\..+>$' \ - "$remote_sha..$local_sha") - if [ -n "$commit" ]; then - echo "Commit $local_sha in $local_ref is missing either \"Signed-off-by\"" \ - " or \"Acked-by\" lines, not pushing." >&2 - exit 1 - fi - - # Make _really_ sure we do not rewrite history of any head/branch - if [ "${remote_ref#*refs/heads/}" != "$remote_ref" ]; then - nonreachable=$(git rev-list $remote_sha ^$local_sha | head -1) - if [ -n "$nonreachable" ]; then - echo "Only fast-forward pushes are allowed on branches." >&2 - echo "At least $nonreachable is not included in $remote_sha while pushing to " \ - "$remote_ref" >&2 - exit 1 - fi - fi - - # FIXME: check commit log format (subject without full stop at the end etc). - # FIXME: do buildbot checks if authorized? -done exit 0 -- To view, visit https://review.coreboot.org/22330 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Gerrit-Change-Number: 22330 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: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit December 2017