Hello Stefan Tauner, build bot (Jenkins),
I'd like you to do a code review. Please visit
https://review.coreboot.org/22336
to review the following change.
Change subject: Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP
......................................................................
Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP
TARGET_OS as well as EXEC_SUFFIX were only set when called via the
main makefile and even then __USE_MINGW_ANSI_STDIO was not set
for MinGW.
While at it, also replace the hardcoded gnu_printf printf format
attribute with __MINGW_PRINTF_FORMAT which is set according to
__USE_MINGW_ANSI_STDIO respectively.
Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25
Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at>
Reviewed-on: https://review.coreboot.org/21838
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
---
M flash.h
M util/ich_descriptors_tool/Makefile
2 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/36/22336/1
diff --git a/flash.h b/flash.h
index 67c7d20..9c3784b 100644
--- a/flash.h
+++ b/flash.h
@@ -324,7 +324,7 @@
/* Let gcc and clang check for correct printf-style format strings. */
int print(enum flashrom_log_level level, const char *fmt, ...)
#ifdef __MINGW32__
-__attribute__((format(gnu_printf, 2, 3)));
+__attribute__((format(__MINGW_PRINTF_FORMAT, 2, 3)));
#else
__attribute__((format(printf, 2, 3)));
#endif
diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile
index e312996..d1b5eae 100644
--- a/util/ich_descriptors_tool/Makefile
+++ b/util/ich_descriptors_tool/Makefile
@@ -21,10 +21,23 @@
# If the user has specified custom CFLAGS, all CFLAGS settings below will be
# completely ignored by gnumake.
CFLAGS ?= -Os -Wall -Wshadow
+
+override TARGET_OS := $(shell $(CC) $(CPPFLAGS) -E $(SHAREDSRCDIR)/os.h | grep -v '^\#' | grep '"' | \
+ cut -f 2 -d'"')
+
ifeq ($(TARGET_OS), DOS)
+EXEC_SUFFIX := .exe
# DJGPP has odd uint*_t definitions which cause lots of format string warnings.
CFLAGS += -Wno-format
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/ */
+FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
+endif
+
ifeq ($(WARNERROR), yes)
CFLAGS += -Werror
endif
--
To view, visit https://review.coreboot.org/22336
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: 1.0.x
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25
Gerrit-Change-Number: 22336
Gerrit-PatchSet: 1
Gerrit-Owner: 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>
Hello build bot (Jenkins),
I'd like you to do a code review. Please visit
https://review.coreboot.org/22335
to review the following change.
Change subject: Use bzip2 when making a tarball
......................................................................
Use bzip2 when making a tarball
Tarballs on download.flashrom.org are generally packaged using bzip2, so
we may as well be internally consistent.
Change-Id: Ib9fb1ea6d5994cd0285ce8db9675640fae992773
Signed-off-by: David Hendricks <dhendricks(a)fb.com>
Reviewed-on: https://review.coreboot.org/22116
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M Makefile
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/35/22335/1
diff --git a/Makefile b/Makefile
index 9184bb3..9cf52b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1408,11 +1408,11 @@
@echo "Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/"
tarball: _export
- @tar -cz --format=ustar -f "$(EXPORTDIR)/flashrom-$(RELEASENAME).tar.gz" -C $(EXPORTDIR)/ \
+ @tar -cj --format=ustar -f "$(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2" -C $(EXPORTDIR)/ \
$(TAROPTIONS) "flashrom-$(RELEASENAME)/"
# Delete the exported directory again because it is most likely what's expected by the user.
@rm -rf "$(EXPORTDIR)/flashrom-$(RELEASENAME)"
- @echo Created "$(EXPORTDIR)/flashrom-$(RELEASENAME).tar.gz"
+ @echo Created "$(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2"
libpayload: clean
make CC="CC=i386-elf-gcc lpgcc" AR=i386-elf-ar RANLIB=i386-elf-ranlib
--
To view, visit https://review.coreboot.org/22335
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: 1.0.x
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9fb1ea6d5994cd0285ce8db9675640fae992773
Gerrit-Change-Number: 22335
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Hello build bot (Jenkins),
I'd like you to do a code review. Please visit
https://review.coreboot.org/22333
to review the following change.
Change subject: Fix ID of ST M25P05
......................................................................
Fix ID of ST M25P05
The (old) ST (now Micron) M25P05 does only support RES for identification.
Unfortunately, the vendor datasheet states the same ID as for the M25P10
(0x10) and thus flashrom has treated these two as evil twins in the past.
However, real hardware confirmed that the real ID of this chip is 0x05.
Change-Id: Idc75f8cb98e7ef0c47c4527cedcc4da3723bd779
Signed-off-by: Serge Vasilugin <vasilugin(a)yandex.ru>
Tested-by: Serge Vasilugin <vasilugin(a)yandex.ru>
Reviewed-on: https://review.coreboot.org/21920
Reviewed-by: Nico Huber <nico.h(a)gmx.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M flashchips.h
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/22333/1
diff --git a/flashchips.h b/flashchips.h
index 28a155d..15574bb 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -748,9 +748,9 @@
*/
#define ST_ID 0x20 /* ST / SGS/Thomson / Numonyx (later acquired by Micron) */
#define ST_M25P05A 0x2010
-#define ST_M25P05_RES 0x10 /* Same code as M25P10. */
+#define ST_M25P05_RES 0x05
#define ST_M25P10A 0x2011
-#define ST_M25P10_RES 0x10 /* Same code as M25P05. */
+#define ST_M25P10_RES 0x10
#define ST_M25P20 0x2012
#define ST_M25P20_RES 0x11
#define ST_M25P40 0x2013
--
To view, visit https://review.coreboot.org/22333
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: 1.0.x
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc75f8cb98e7ef0c47c4527cedcc4da3723bd779
Gerrit-Change-Number: 22333
Gerrit-PatchSet: 1
Gerrit-Owner: 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>
Nico Huber has uploaded this change for review. ( 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>
---
M util/git-hooks/commit-msg
M util/git-hooks/pre-push
2 files changed, 7 insertions(+), 54 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/22330/1
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: newchange
Gerrit-Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f
Gerrit-Change-Number: 22330
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>