Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75788?usp=email )
Change subject: Update chromeec submodule to upstream master
......................................................................
Update chromeec submodule to upstream master
Updating from commit id e486b388a7:
2022-01-12 21:11:11 +0000 - (zephyr: Update power policy for API change)
to commit id e925422cc7:
2023-06-10 00:04:33 +0000 - (README: add an example on how to change gbb flags from servo)
This brings in 9731 new commits.
Change-Id: I8b29891b99f780a98c3637305b20903c59b890f4
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M 3rdparty/chromeec
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/75788/1
diff --git a/3rdparty/chromeec b/3rdparty/chromeec
index e486b38..e925422 160000
--- a/3rdparty/chromeec
+++ b/3rdparty/chromeec
@@ -1 +1 @@
-Subproject commit e486b388a73f1e19f3142774d0b3ee166e8f41ff
+Subproject commit e925422cc769f31472a1b8bffb20b018a1a68094
--
To view, visit https://review.coreboot.org/c/coreboot/+/75788?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8b29891b99f780a98c3637305b20903c59b890f4
Gerrit-Change-Number: 75788
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-MessageType: newchange
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75787?usp=email )
Change subject: Update opensbi submodule to upstream master
......................................................................
Update opensbi submodule to upstream master
Updating from commit id 5019fd1:
2022-09-01 16:53:28 +0530 - (include: sbi: Reduce includes in sbi_pmu.h)
to commit id 355796c:
2023-06-06 16:01:14 +0530 - (lib: utils/irqchip: Use scratch space to save per-HART IMSIC pointer)
This brings in 232 new commits.
Change-Id: I161bd2a55255e73cd331baf3f8e9de889922ec3b
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M 3rdparty/opensbi
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/75787/1
diff --git a/3rdparty/opensbi b/3rdparty/opensbi
index 5019fd1..355796c 160000
--- a/3rdparty/opensbi
+++ b/3rdparty/opensbi
@@ -1 +1 @@
-Subproject commit 5019fd124b4c46e1581129c5154fc2cdd3b777ed
+Subproject commit 355796c5bc1906d749850e4215e0f7f53802ba5b
--
To view, visit https://review.coreboot.org/c/coreboot/+/75787?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I161bd2a55255e73cd331baf3f8e9de889922ec3b
Gerrit-Change-Number: 75787
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: newchange
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75786?usp=email )
Change subject: Update libgfxinit submodule to upstream master
......................................................................
Update libgfxinit submodule to upstream master
Updating from commit id 066e52e:
2022-10-04 14:04:23 +0000 - (Fix "unnecessary with of ancestor [-gnatwr]")
to commit id 732feb4:
2023-06-04 12:14:31 +0000 - (gma i2c: Update for Tiger Lake)
This brings in 17 new commits:
732feb4 gma i2c: Update for Tiger Lake
fc49b60 gma: Update PCH Rawclk programming for TGL
1b65b84 gma: Update BDSM register offset for TGL onwards
79a5379 gma pcode: Add Mailbox_Read procedure
b6df683 gma registers: Update for Tiger Lake and Alder Lake
24748f3 dp aux: Add support for TGL
e9631d8 gma: Begin Alder Lake (ADL) integration
605660b gma: Begin Tiger Lake (TGL) integration
0dadb67 gma pch-transcoder: Work around GNAT issue
fe80fbb common: Turn off VGA when not in use anymore
793f4f8 gma: Correct Global annotation for Initialize()
1dff38c gma: Make HW.GFX.GMA.SPLL package private
c68cafa gma skylake: Avoid aliasing of Config.State
17b513e gma: Shuffle warning justifications to support old and new tooling
3c1ac18 display probing: Update warning justification
b636d81 framebuffer filler: Extend loop invariant to assist prover
420e863 dp info: Provide Link_Status'Object_Size and padding
Change-Id: I17a95cc0b8e9dc4bffe8c82f0f53ee411281061b
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M 3rdparty/libgfxinit
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/75786/1
diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
index 066e52e..732feb4 160000
--- a/3rdparty/libgfxinit
+++ b/3rdparty/libgfxinit
@@ -1 +1 @@
-Subproject commit 066e52eeaa329d782ccee96265a6a351fc395bf1
+Subproject commit 732feb414dcb58e9282d25fc8c569d372d179f47
--
To view, visit https://review.coreboot.org/c/coreboot/+/75786?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I17a95cc0b8e9dc4bffe8c82f0f53ee411281061b
Gerrit-Change-Number: 75786
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-MessageType: newchange
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75783?usp=email )
Change subject: Switch gitconfig.sh over to use main branch
......................................................................
Switch gitconfig.sh over to use main branch
Change-Id: Iea1a7e61b60c4bf04be2fed9c503eaf7e20fe462
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M util/gitconfig/gitconfig.sh
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/75783/1
diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh
index 148d437..e91a039 100755
--- a/util/gitconfig/gitconfig.sh
+++ b/util/gitconfig/gitconfig.sh
@@ -39,11 +39,11 @@
for d in 3rdparty/{blobs,libhwbase,libgfxinit}; do
if [ -d $d ]; then
(cd $d || exit 1
- git config remote.origin.push HEAD:refs/for/master)
+ git config remote.origin.push HEAD:refs/for/main)
fi
done
-git config remote.origin.push HEAD:refs/for/master
+git config remote.origin.push HEAD:refs/for/main
git config alias.sup "!git submodule update --remote --rebase && \
git submodule update --init --checkout"
--
To view, visit https://review.coreboot.org/c/coreboot/+/75783?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iea1a7e61b60c4bf04be2fed9c503eaf7e20fe462
Gerrit-Change-Number: 75783
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-MessageType: newchange
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75782?usp=email )
Change subject: Switch scripts over to use main branch
......................................................................
Switch scripts over to use main branch
This will be needed to switch over to main branch in coreboot
Change-Id: I90fadf2352d56074ce8b58d559a73b0c53fac14b
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M util/scripts/cross-repo-cherrypick
M util/scripts/update_submodules
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/75782/1
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 1a174a9..3dad512 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -4,14 +4,14 @@
# SPDX-License-Identifier: GPL-2.0-only
# Adapt to your remote branch:
-BRANCH="origin/master"
+BRANCH="origin/main"
# When pulling in patches from another tree from a gerrit repository,
# do the following at the end of a larger cherry-pick series:
# git remote add ...
# git checkout -b upstreaming
# git cherry-pick ...
-# git rebase -i --exec util/scripts/cross-repo-cherrypick master
+# git rebase -i --exec util/scripts/cross-repo-cherrypick main
# Alternatively, you can run util/scripts/cross-repo-cherrypick after every
# individual cherry-pick.
@@ -24,7 +24,7 @@
ORIGIN_HOST=$( commit_message |grep "^Reviewed-on: " |head -1 |cut -d/ -f3 )
case "${ORIGIN_HOST}" in
review.coreboot.org)
- BRANCH="origin/master"
+ BRANCH="origin/main"
MESSAGE_PREFIX="UPSTREAM: "
;;
chromium-review.googlesource.com)
diff --git a/util/scripts/update_submodules b/util/scripts/update_submodules
index 4ca2925..f966fb3 100755
--- a/util/scripts/update_submodules
+++ b/util/scripts/update_submodules
@@ -138,7 +138,7 @@
cd "${TOP}" || exit 1
git add "${submodule}" > /dev/null 2>&1 || exit 1
git commit -s -F- > /dev/null 2>&1 <<-EOF
- Update ${submodule##*/} submodule to upstream master
+ Update ${submodule##*/} submodule to upstream main
Updating from commit id ${initial_commit_id}:
$initial_commit_description
--
To view, visit https://review.coreboot.org/c/coreboot/+/75782?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I90fadf2352d56074ce8b58d559a73b0c53fac14b
Gerrit-Change-Number: 75782
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-MessageType: newchange
Attention is currently required from: Felix Singer, Martin L Roth.
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75781?usp=email )
Change subject: Switch jenkins node over to use encapsulate main branch
......................................................................
Switch jenkins node over to use encapsulate main branch
This is only needed once we want to recreate the docker
Change-Id: I493acb4de615508b08826f814ef6ac1b37cbdf0c
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M util/docker/coreboot-jenkins-node/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/75781/1
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile
index 37537cc..f717dbc 100644
--- a/util/docker/coreboot-jenkins-node/Dockerfile
+++ b/util/docker/coreboot-jenkins-node/Dockerfile
@@ -72,7 +72,7 @@
echo "tmpfs /home/coreboot/.ccache tmpfs rw,mode=1777 0 0" >> /etc/fstab
# Build encapsulate tool
-ADD https://raw.githubusercontent.com/coreboot/encapsulate/master/encapsulate.c /tmp/encapsulate.c
+ADD https://raw.githubusercontent.com/coreboot/encapsulate/main/encapsulate.c /tmp/encapsulate.c
RUN gcc -o /usr/sbin/encapsulate /tmp/encapsulate.c && \
chown root /usr/sbin/encapsulate && \
chmod +s /usr/sbin/encapsulate
--
To view, visit https://review.coreboot.org/c/coreboot/+/75781?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I493acb4de615508b08826f814ef6ac1b37cbdf0c
Gerrit-Change-Number: 75781
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-MessageType: newchange
Attention is currently required from: Angel Pons, Felix Singer, Jason Glenesk, Martin L Roth.
Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/75780?usp=email )
Change subject: Switch release scripts over to use main branch
......................................................................
Switch release scripts over to use main branch
In preparation for switching over coreboot.
Change-Id: Id66f0def84b913fc8fdd4ee77fef996e45dbd4f5
Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
---
M util/release/genrelnotes
M util/release/gerrit_stats.pl
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/75780/1
diff --git a/util/release/genrelnotes b/util/release/genrelnotes
index 1bbe554..c1b1195 100755
--- a/util/release/genrelnotes
+++ b/util/release/genrelnotes
@@ -28,7 +28,7 @@
# Try to verify that the repo is clean before losing state.
if ! git diff-index --quiet --cached HEAD 2>/dev/null || \
- [ "$(git diff origin/master --shortstat 2>/dev/null | tail -n1)" != "" ]; then
+ [ "$(git diff origin/main --shortstat 2>/dev/null | tail -n1)" != "" ]; then
echo "ERROR: repo is not clean. Exiting." >&2
exit 1
fi
@@ -38,7 +38,7 @@
echo
echo "Usage: $0 <old_version> <new_version> [release notes file]"
echo "Old version should be a tag (4.1), a branch (origin/4.1), or a commit id"
- echo "New version can be a branch (origin/master) a tag (4.2), or a commit id"
+ echo "New version can be a branch (origin/main) a tag (4.2), or a commit id"
echo "Logfile can be a new file or an existing file to update"
echo "Example: \"$0 origin/4.1 4.2 rnotes.txt\""
echo
@@ -188,7 +188,7 @@
printf "\n Cleaning up and exiting.\n" >&2
find 'src' -name 'gnumakefile' \
-exec rename 's/gnumakefile/Makefile\.inc/' {} \;
- git checkout origin/master > /dev/null 2>&1
+ git checkout origin/main > /dev/null 2>&1
git submodule update --init --checkout > /dev/null 2>&1
rm "$LOGFILE"
exit 1;
@@ -299,7 +299,7 @@
printf "Calculating new SLOC\n"
NEW_SLOC=$(get_sloc)
-git checkout origin/master > /dev/null 2>&1
+git checkout origin/main > /dev/null 2>&1
git submodule update --init --checkout > /dev/null 2>&1
trap "" SIGINT
diff --git a/util/release/gerrit_stats.pl b/util/release/gerrit_stats.pl
index 789cb05..5cb3160 100755
--- a/util/release/gerrit_stats.pl
+++ b/util/release/gerrit_stats.pl
@@ -706,7 +706,7 @@
sub usage {
print "gerrit_stats <options> [Old version] [New version]\n";
print "Old version should be a tag (4.1), a branch (origin/4.1), or a commit id\n";
- print "New version can be 'HEAD' a branch (origin/master) a tag (4.2), or a commit id\n";
+ print "New version can be 'HEAD' a branch (origin/main) a tag (4.2), or a commit id\n";
print " Options:\n";
print " u | url [url] url with username.\n";
print "Example: \"$0 -u Gaumless\@review.coreboot.org:29418 origin/4.1 4.2\"\n";
--
To view, visit https://review.coreboot.org/c/coreboot/+/75780?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id66f0def84b913fc8fdd4ee77fef996e45dbd4f5
Gerrit-Change-Number: 75780
Gerrit-PatchSet: 1
Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-MessageType: newchange