[coreboot-gerrit] [S] Change in coreboot[master]: payloads/Memtest86Plus: Update branch name from master to main

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/76100?usp=email )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: payloads/Memtest86Plus: Update branch name from master to main
......................................................................

payloads/Memtest86Plus: Update branch name from master to main

It seems like the default branch for coreboot's Memtest86+ fork was
renamed from 'master' to 'main'.

TEST: Memtest builds correctly when selecting 'Main' for the Memtest86+
version option.

Change-Id: I269249518019f5d0d12c57f1c14012abca86b48b
Signed-off-by: Nicholas Chin 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76100
Reviewed-by: Felix Singer 
Tested-by: build bot (Jenkins) 
---
M payloads/external/Makefile.inc
M payloads/external/Memtest86Plus/Kconfig.secondary
M payloads/external/Memtest86Plus/Makefile
3 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 85e01b9..e367cb8 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -319,7 +319,7 @@
    	AS="$(AS_x86_32)" \
    	CONFIG_MEMTEST_REVISION=$(CONFIG_MEMTEST_REVISION) \
    	CONFIG_MEMTEST_REVISION_ID=$(CONFIG_MEMTEST_REVISION_ID) \
-		CONFIG_MEMTEST_MASTER=$(CONFIG_MEMTEST_MASTER) \
+		CONFIG_MEMTEST_MAIN=$(CONFIG_MEMTEST_MAIN) \
    	CONFIG_MEMTEST_STABLE=$(CONFIG_MEMTEST_STABLE) \
    	$(MEMTEST_SERIAL_OPTIONS) \
    	MFLAGS= MAKEFLAGS=
diff --git a/payloads/external/Memtest86Plus/Kconfig.secondary b/payloads/external/Memtest86Plus/Kconfig.secondary
index 7c4da9e..98a0d06 100644
--- a/payloads/external/Memtest86Plus/Kconfig.secondary
+++ b/payloads/external/Memtest86Plus/Kconfig.secondary
@@ -11,8 +11,8 @@
      Stable Memtest86+ version.

For reproducible builds, this option must be selected.
-config MEMTEST_MASTER
-	bool "Master"
+config MEMTEST_MAIN
+	bool "Main"
    help
      Newest Memtest86+ version.

@@ -35,7 +35,7 @@
 config MEMTEST_REVISION_ID
    string "Insert a commit's SHA-1 or a branch name"
    depends on MEMTEST_REVISION
-	default "origin/master"
+	default "origin/main"
    help
       The commit's SHA-1 or branch name of the revision to use.

diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile
index 3853cb9..fe24e2c78 100644
--- a/payloads/external/Memtest86Plus/Makefile
+++ b/payloads/external/Memtest86Plus/Makefile
@@ -1,7 +1,7 @@
 ## SPDX-License-Identifier: GPL-2.0-only

-TAG-$(CONFIG_MEMTEST_MASTER)=origin/master
-NAME-$(CONFIG_MEMTEST_MASTER)=Master
+TAG-$(CONFIG_MEMTEST_MAIN)=origin/main
+NAME-$(CONFIG_MEMTEST_MAIN)=Main
 TAG-$(CONFIG_MEMTEST_STABLE)=0bd34c22604660e4283316331f3e7bf8a3863753
 NAME-$(CONFIG_MEMTEST_STABLE)=Stable
 TAG-$(CONFIG_MEMTEST_REVISION)=$(CONFIG_MEMTEST_REVISION_ID)
@@ -26,14 +26,14 @@
    false
 endif
    -cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; \
-		if [ $$? -ne 0 ] || [ "$(TAG-y)" = "origin/master" ]; then \
+		if [ $$? -ne 0 ] || [ "$(TAG-y)" = "origin/main" ]; then \
    	echo "    Fetching new commits from the $(project_name) git repo"; \
    	git fetch; fi

checkout: fetch
    echo "    Checking out $(project_name) revision $(NAME-y) ($(TAG-y))"
    cd $(project_dir); \
-		git checkout master; \
+		git checkout main; \
    	git branch -D coreboot 2>/dev/null; \
    	git checkout -b coreboot $(TAG-y)