diff options
Diffstat (limited to 'payloads/external/Memtest86Plus')
-rw-r--r-- | payloads/external/Memtest86Plus/Kconfig.secondary | 6 | ||||
-rw-r--r-- | payloads/external/Memtest86Plus/Makefile | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/payloads/external/Memtest86Plus/Kconfig.secondary b/payloads/external/Memtest86Plus/Kconfig.secondary index 7c4da9e509..98a0d06cb9 100644 --- a/payloads/external/Memtest86Plus/Kconfig.secondary +++ b/payloads/external/Memtest86Plus/Kconfig.secondary @@ -11,8 +11,8 @@ config MEMTEST_STABLE 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 @@ endchoice 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 3853cb9586..fe24e2c780 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 @@ endif 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) |