Nico Huber has uploaded this change for review. ( https://review.coreboot.org/20265
Change subject: fixup! Make read_ich_descriptors_from_dump() available in flashrom
......................................................................
fixup! Make read_ich_descriptors_from_dump() available in flashrom
Add a guard around read_ich_descriptors_via_fdo() which uses raw
hardware access and is only called from `ichspi`.
Fixes linking in case `NEED_RAW_ACCESS != 1`.
Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002
Signed-off-by: Nico Huber <nico.huber(a)secunet.com>
---
M ich_descriptors.c
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/20265/1
diff --git a/ich_descriptors.c b/ich_descriptors.c
index b6453ce..ecc2b95 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -846,6 +846,8 @@
return (1 << (19 + size_enc));
}
+/* Only used by ichspi.c */
+#if CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__))
static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar)
{
uint32_t control = 0;
@@ -917,6 +919,7 @@
msg_pdbg2(" done.\n");
return ICH_RET_OK;
}
+#endif
/**
* @brief Read a layout from the dump of an Intel ICH descriptor.
--
To view, visit https://review.coreboot.org/20265
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: staging
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002
Gerrit-Change-Number: 20265
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
David Hendricks has posted comments on this change. ( https://review.coreboot.org/20263 )
Change subject: util/getrevision.sh: Change version string
......................................................................
Patch Set 1: Code-Review-2
(2 comments)
Just to echo my previous comments from the other patch, I am not sold on this approach. I think it adds needless complexity to the script, has no valuable use case, and actually has negative utility since it makes it difficult to programmatically parse the version string.
The git-fu is kind neat, though.
https://review.coreboot.org/#/c/20263/1//COMMIT_MSG
Commit Message:
https://review.coreboot.org/#/c/20263/1//COMMIT_MSG@40
PS1, Line 40: 5 commits since last tag in upstream's stable branch:
: flashrom v0.9.99-5-stable-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64)
:
: 3 commits since last tag in upstream's staging branch and
: 4 local commits on top of that:
: flashrom v0.9.99-3-staging-4-e4f6643 on Linux 3.13.0-76-generic (x86_64)
:
: 3 commits since last tag in upstream's staging branch and
: 4 local commits on top of that, and some local uncommitted changes too:
: flashrom v0.9.99-3-staging-4-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64)
:
: 3 commits since the last tag in an unrelated upstream branch
: (e.g., a stable release *branch* such as 0.9.99.x) or local branch:
: flashrom v0.9.99-3-e4f6643 on Linux 3.13.0-76-generic (x86_64)
Honestly, who cares? If somebody gets on the mailing list and presents this info, what value does it provide?
AFAICT the only interesting part is the sha and "-dirty".
I suppose one could make an argument for the branch name, but as you pointed out there's no guarantee that the branches are synchronized so even that info may just be misleading.
https://review.coreboot.org/#/c/20263/1/util/getrevision.sh
File util/getrevision.sh:
https://review.coreboot.org/#/c/20263/1/util/getrevision.sh@295
PS1, Line 295: r="$upstream_branch-$r"
: r="$cnt_tag2upstream_branch-$r"
These can also be merged into a single line, if preferred.
--
To view, visit https://review.coreboot.org/20263
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: staging
Gerrit-MessageType: comment
Gerrit-Change-Id: Id6de60be4c751c070d4da648825a7e7b70e4a759
Gerrit-Change-Number: 20263
Gerrit-PatchSet: 1
Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Mon, 19 Jun 2017 02:41:10 +0000
Gerrit-HasComments: Yes
David Hendricks has posted comments on this change. ( https://review.coreboot.org/19206 )
Change subject: Convert flashrom to git
......................................................................
Patch Set 6:
Patch set 6 reverts all the changes to the version string, which are now in the follow-up patch.
--
To view, visit https://review.coreboot.org/19206
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: staging
Gerrit-MessageType: comment
Gerrit-Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2
Gerrit-Change-Number: 19206
Gerrit-PatchSet: 6
Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com>
Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Reviewer: david.hendricks(a)gmail.com
Gerrit-Comment-Date: Mon, 19 Jun 2017 02:28:02 +0000
Gerrit-HasComments: No