- flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: Prepare for a single branch on gerrit
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/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

Change in flashrom[master]: flashchips: Add MX25L6473F
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/22759 ) Change subject: flashchips: Add MX25L6473F ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/920/ : SUCCESS -- To view, visit https://review.coreboot.org/22759 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibea956e48e10fda91930b65b3bf3b3ae4ad13f63 Gerrit-Change-Number: 22759 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 23:11:22 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: flashchips: Add MX25L6473F
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/22759 ) Change subject: flashchips: Add MX25L6473F ...................................................................... flashchips: Add MX25L6473F Just another chip sharing the same ID. Tested by somebody on IRC. Change-Id: Ibea956e48e10fda91930b65b3bf3b3ae4ad13f63 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/22759 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index a1ad445..a33b37e 100644 --- a/flashchips.c +++ b/flashchips.c @@ -7929,7 +7929,7 @@ { .vendor = "Macronix", - .name = "MX25L6436E/MX25L6445E/MX25L6465E/MX25L6473E", + .name = "MX25L6436E/MX25L6445E/MX25L6465E/MX25L6473E/MX25L6473F", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, .model_id = MACRONIX_MX25L6405, -- To view, visit https://review.coreboot.org/22759 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibea956e48e10fda91930b65b3bf3b3ae4ad13f63 Gerrit-Change-Number: 22759 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: 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 Nico Huber (Code Review) 10 Dec '17

10 Dec '17

Nico Huber 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 1: Code-Review+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. -- 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: 1 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: Sat, 09 Dec 2017 23:09:25 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[1.0.x]: internal: Fix warnings about unused constants
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/22800 ) Change subject: internal: Fix warnings about unused constants ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/919/ : SUCCESS -- To view, visit https://review.coreboot.org/22800 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: comment Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22800 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 22:45:58 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[1.0.x]: internal: Fix warnings about unused constants
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/22800 ) Change subject: internal: Fix warnings about unused constants ...................................................................... internal: Fix warnings about unused constants By adding more #if guards, fix warnings about unused constants that are enabled by default in newer GCC versions. Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/22669 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Reviewed-by: Patrick Rudolph <siro(a)das-labor.org> (cherry picked from commit 97a90497a7d0df5076b4412c3e995a7e4a2ff8cc) Reviewed-on: https://review.coreboot.org/22800 --- M internal.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/internal.c b/internal.c index 4062b64..276e14b 100644 --- a/internal.c +++ b/internal.c @@ -131,6 +131,7 @@ int is_laptop = 0; int laptop_ok = 0; +#if IS_X86 || IS_MIPS static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); static void internal_chip_writew(const struct flashctx *flash, uint16_t val, @@ -155,6 +156,7 @@ .chip_writel = internal_chip_writel, .chip_writen = fallback_chip_writen, }; +#endif enum chipbustype internal_buses_supported = BUS_NONE; @@ -358,6 +360,7 @@ } #endif +#if IS_X86 || IS_MIPS static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { @@ -400,3 +403,4 @@ mmio_readn((void *)addr, buf, len); return; } +#endif -- To view, visit https://review.coreboot.org/22800 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: merged Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22800 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[1.0.x]: internal: Fix warnings about unused constants
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/22800 ) Change subject: internal: Fix warnings about unused constants ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/803/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/918/ : SUCCESS -- To view, visit https://review.coreboot.org/22800 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: comment Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22800 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 22:44:50 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[1.0.x]: internal: Fix warnings about unused constants
by Nico Huber (Code Review) 09 Dec '17

09 Dec '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/22800 ) Change subject: internal: Fix warnings about unused constants ...................................................................... Patch Set 1: Code-Review+2 Already reviewed on staging. -- To view, visit https://review.coreboot.org/22800 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: comment Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22800 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Sat, 09 Dec 2017 22:44:39 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[1.0.x]: internal: Fix warnings about unused constants
by Nico Huber (Code Review) 09 Dec '17

09 Dec '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/22800 Change subject: internal: Fix warnings about unused constants ...................................................................... internal: Fix warnings about unused constants By adding more #if guards, fix warnings about unused constants that are enabled by default in newer GCC versions. Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/22669 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> Reviewed-by: Patrick Rudolph <siro(a)das-labor.org> (cherry picked from commit 97a90497a7d0df5076b4412c3e995a7e4a2ff8cc) --- M internal.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/00/22800/1 diff --git a/internal.c b/internal.c index 4062b64..276e14b 100644 --- a/internal.c +++ b/internal.c @@ -131,6 +131,7 @@ int is_laptop = 0; int laptop_ok = 0; +#if IS_X86 || IS_MIPS static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); static void internal_chip_writew(const struct flashctx *flash, uint16_t val, @@ -155,6 +156,7 @@ .chip_writel = internal_chip_writel, .chip_writen = fallback_chip_writen, }; +#endif enum chipbustype internal_buses_supported = BUS_NONE; @@ -358,6 +360,7 @@ } #endif +#if IS_X86 || IS_MIPS static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { @@ -400,3 +403,4 @@ mmio_readn((void *)addr, buf, len); return; } +#endif -- To view, visit https://review.coreboot.org/22800 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22800 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[master]: internal: Fix warnings about unused constants
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/22669 ) Change subject: internal: Fix warnings about unused constants ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/917/ : SUCCESS -- To view, visit https://review.coreboot.org/22669 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3b6d7c0c2fadc4faeab971673bfadb1a6d25919 Gerrit-Change-Number: 22669 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: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 09 Dec 2017 22:43:14 +0000 Gerrit-HasComments: No

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit