Attention is currently required from: Anil Kumar K, Bora Guvendik, Julius Werner, Jérémy Compostella, Subrata Banik, Wonkyu Kim.
Hello Anil Kumar K, Bora Guvendik, Jérémy Compostella, Subrata Banik, Wonkyu Kim, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/83153?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by Jérémy Compostella, Verified-1 by build bot (Jenkins)
Change subject: src/lib: Add Kconfig variable for fw_config default value
......................................................................
src/lib: Add Kconfig variable for fw_config default value
This CONFIG_FW_CONFIG_DEFAULT_VALUE flag is default to
UNDEFINED_FW_CONFIG and won't be used when retrieving fw_config
value. Set this with different value in config.<board> file, and
it will be used when fw_config is not able to read via Chrome EC,
CBFS or VPD.
TEST=boot and check fw_config value from coreboot log
Signed-off-by: Cliff Huang <cliff.huang(a)intel.com>
Change-Id: I9694433e01bdcd9ff1e550585c14ea7ccee020a3
---
M src/Kconfig
M src/lib/fw_config.c
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/83153/3
--
To view, visit https://review.coreboot.org/c/coreboot/+/83153?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I9694433e01bdcd9ff1e550585c14ea7ccee020a3
Gerrit-Change-Number: 83153
Gerrit-PatchSet: 3
Gerrit-Owner: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-Reviewer: Anil Kumar K <anil.kumar.k(a)intel.com>
Gerrit-Reviewer: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Reviewer: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Hannah Williams <hannah.williams(a)intel.com>
Gerrit-CC: Julius Werner <jwerner(a)chromium.org>
Gerrit-Attention: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Attention: Anil Kumar K <anil.kumar.k(a)intel.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Attention: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-Attention: Julius Werner <jwerner(a)chromium.org>
Attention is currently required from: Elyes Haouas, Martin L Roth.
Julius Werner has posted comments on this change by Elyes Haouas. ( https://review.coreboot.org/c/coreboot/+/83157?usp=email )
Change subject: tree: Use pkgconf over pkg-config
......................................................................
Patch Set 5:
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/83157/comment/dc89fdf0_5c103e78?us… :
PS5, Line 7: tree: Use pkgconf over pkg-config
> Indeed, pkgconf does not bring new necessary functionalities for coreboot but […]
pkgconf is supposed to be fully backwards-compatible to pkg-config. Does FreeBSD not provide a symlink from /usr/bin/pkg-config to /usr/bin/pkgconf? It should.
--
To view, visit https://review.coreboot.org/c/coreboot/+/83157?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I3e9a92d019854214a5760f705b9cbe3cabe6d2e8
Gerrit-Change-Number: 83157
Gerrit-PatchSet: 5
Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Comment-Date: Wed, 26 Jun 2024 19:57:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Julius Werner <jwerner(a)chromium.org>
Comment-In-Reply-To: Elyes Haouas <ehaouas(a)noos.fr>
Cliff Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83225?usp=email )
Change subject: payloads/depthcharge: support depthcharge build with local changes
......................................................................
payloads/depthcharge: support depthcharge build with local changes
Allow building with local changes.
Add dependency and target for generated static_fw_config.h.
This ensures this file is geneerated prior to building depthcharge.
Fix 'git fetch' for the repo other than origin/main.
TEST=deptcharge should build with local changes
Signed-off-by: Cliff Huang <cliff.huang(a)intel.com>
Change-Id: I95c1f71ae149537a2191734a62f416b7b6f41fc6
---
M Makefile.mk
M payloads/external/Makefile.mk
M payloads/external/depthcharge/Makefile
3 files changed, 15 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/83225/1
diff --git a/Makefile.mk b/Makefile.mk
index 301a3bc..d2025ba 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -708,7 +708,7 @@
DEVICETREE_FWCONFIG_H := $(obj)/static_fw_config.h
SCONFIG_OPTIONS += --output_f=$(DEVICETREE_FWCONFIG_H)
-$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(OVERRIDE_DEVICETREE_FILE) $(CHIPSET_DEVICETREE_FILE) $(objutil)/sconfig/sconfig
+$(DEVICETREE_STATIC_C) $(DEVICETREE_FWCONFIG_H): $(DEVICETREE_FILE) $(OVERRIDE_DEVICETREE_FILE) $(CHIPSET_DEVICETREE_FILE) $(objutil)/sconfig/sconfig
@printf " SCONFIG $(subst $(src)/,,$(<))\n"
mkdir -p $(dir $(DEVICETREE_STATIC_C))
$(objutil)/sconfig/sconfig $(SCONFIG_OPTIONS)
diff --git a/payloads/external/Makefile.mk b/payloads/external/Makefile.mk
index 4a17791..4c94e62 100644
--- a/payloads/external/Makefile.mk
+++ b/payloads/external/Makefile.mk
@@ -142,7 +142,7 @@
# Depthcharge
-payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL)
+payloads/external/depthcharge/depthcharge/build/depthcharge.elf depthcharge: $(DOTCONFIG) $(CBFSTOOL) $(DEVICETREE_FWCONFIG_H)
$(MAKE) -C payloads/external/depthcharge \
BOARD=$(BOARD) \
MFLAGS= MAKEFLAGS= \
diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile
index af303da..7107a59 100644
--- a/payloads/external/depthcharge/Makefile
+++ b/payloads/external/depthcharge/Makefile
@@ -45,19 +45,27 @@
@cd $(project_dir); \
git show $(TAG-y) >/dev/null 2>&1; \
if [ $$? -ne 0 ] || \
- [ "$(TAG-y)" = "origin/main" ]; then \
+ [ "$(TAG-y)" = $(DEPTHCHARGE_BRANCH) ]; then \
echo " Fetching new commits from the $(project_name) git repo"; \
git fetch; fi
# Check out the requested version of the tree
-# Don't write a file for main branch so the latest remote version is always used
+# Don't write a file for main branch so the latest remote version is always used.
+# If repo has local changes, The latest code of remote main branch won't be
+# checked out and the existing code is used to build.
$(project_dir)/.version_$(TAG-y): fetch
echo " Checking out $(project_name) revision $(TAG-y)"
rm -f $(project_dir)/.version_*
cd $(project_dir); \
- git checkout main; \
- git branch -D coreboot 2>/dev/null; \
- git checkout -b coreboot $(TAG-y)
+ git diff-index --quiet HEAD -- ; \
+ if [ $$? -eq 0 ] ; then \
+ echo " Checking out branch"; \
+ git checkout main ; \
+ git branch -D coreboot 2>/dev/null ; \
+ git checkout -b coreboot $(TAG-y); \
+ else \
+ echo " Contain local changes. Skip checking out latest code from $(TAG-y)"; \
+ fi
ifneq ($(DEPTHCHARGE_MASTER),y)
touch $(project_dir)/.version_$(TAG-y)
endif
--
To view, visit https://review.coreboot.org/c/coreboot/+/83225?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I95c1f71ae149537a2191734a62f416b7b6f41fc6
Gerrit-Change-Number: 83225
Gerrit-PatchSet: 1
Gerrit-Owner: Cliff Huang <cliff.huang(a)intel.com>
Attention is currently required from: Felix Held.
Varshit Pandya has posted comments on this change by Felix Held. ( https://review.coreboot.org/c/coreboot/+/83224?usp=email )
Change subject: lib/string: use size_t for local variable in strncmp
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/83224?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibe35d3741bc6d8a16a3bad3ec27aafc30745d931
Gerrit-Change-Number: 83224
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Reviewer: Varshit Pandya <pandyavarshit(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 26 Jun 2024 19:04:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: Felix Held.
Marshall Dawson has posted comments on this change by Felix Held. ( https://review.coreboot.org/c/coreboot/+/83224?usp=email )
Change subject: lib/string: use size_t for local variable in strncmp
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/83224?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibe35d3741bc6d8a16a3bad3ec27aafc30745d931
Gerrit-Change-Number: 83224
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 26 Jun 2024 18:43:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Felix Held has posted comments on this change by Felix Held. ( https://review.coreboot.org/c/coreboot/+/83224?usp=email )
Change subject: lib/string: use size_t for local variable in strncmp
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
or should i squash this into CB:83222 ?
--
To view, visit https://review.coreboot.org/c/coreboot/+/83224?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibe35d3741bc6d8a16a3bad3ec27aafc30745d931
Gerrit-Change-Number: 83224
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 26 Jun 2024 18:43:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83224?usp=email )
Change subject: lib/string: use size_t for local variable in strncmp
......................................................................
lib/string: use size_t for local variable in strncmp
Since the 'maxlen' parameter's type is changed to size_t, the type of
the local variable 'i' which this is compared against should also be
changed to size_t.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: Ibe35d3741bc6d8a16a3bad3ec27aafc30745d931
---
M src/lib/string.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/83224/1
diff --git a/src/lib/string.c b/src/lib/string.c
index b1996ff..a7f8074 100644
--- a/src/lib/string.c
+++ b/src/lib/string.c
@@ -115,7 +115,7 @@
int strncmp(const char *s1, const char *s2, size_t maxlen)
{
- int i;
+ size_t i;
for (i = 0; i < maxlen; i++) {
if ((s1[i] != s2[i]) || (s1[i] == '\0'))
--
To view, visit https://review.coreboot.org/c/coreboot/+/83224?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ibe35d3741bc6d8a16a3bad3ec27aafc30745d931
Gerrit-Change-Number: 83224
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>