Name of user not set #1004172 has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63351 )
Change subject: payloads/external/LinuxBoot: Modify Kconfig file and remove olders versions ......................................................................
payloads/external/LinuxBoot: Modify Kconfig file and remove olders versions
The U-ROOT repo have modified the name of "master" branch to "main" branch this patch remove olders versions of u-root and use the new versions
Change-Id: I70c4d064b534b28ea0be987b91a30650debc6ffe Signed-off-by: RatatouilleDummie ratatouillemorde@gmail.com --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 3 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/63351/1
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index a1e4e1f..1aa66068 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -177,26 +177,26 @@
choice prompt "U-root version" - default LINUXBOOT_UROOT_MASTER + default LINUXBOOT_UROOT_MAIN
config LINUXBOOT_UROOT_CUSTOM bool "custom" help choose a custom u-root branch
-config LINUXBOOT_UROOT_MASTER - bool "master" +config LINUXBOOT_UROOT_MAIN + bool "main" help Latest u-root version
-config LINUXBOOT_UROOT_V3_0_0 - bool "v3.0.0" +config LINUXBOOT_UROOT_V7_0_0 + bool "v7.0.0"
-config LINUXBOOT_UROOT_V2_0_0 - bool "v2.0.0" +config LINUXBOOT_UROOT_V6_0_0 + bool "v6.0.0"
-config LINUXBOOT_UROOT_V1_0_0 - bool "v1.0.0" +config LINUXBOOT_UROOT_V5_0_0 + bool "v5.0.0"
endchoice
@@ -207,10 +207,10 @@ config LINUXBOOT_UROOT_VERSION string default LINUXBOOT_UROOT_CHECKOUT if LINUXBOOT_UROOT_CUSTOM - default "master" if LINUXBOOT_UROOT_MASTER - default "v3.0.0" if LINUXBOOT_UROOT_V3_0_0 - default "v2.0.0" if LINUXBOOT_UROOT_V2_0_0 - default "v1.0.0" if LINUXBOOT_UROOT_V1_0_0 + default "main" if LINUXBOOT_UROOT_MAIN + default "v7.0.0" if LINUXBOOT_UROOT_V7_0_0 + default "v6.0.0" if LINUXBOOT_UROOT_V6_0_0 + default "v5.0.0" if LINUXBOOT_UROOT_V5_0_0
choice prompt "Build format" diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index 0cf91fe..1fdd539 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -5,7 +5,7 @@ uroot_bin=$(project_dir)/u-root uroot_package=github.com/u-root/u-root
-ARCH-$(CONFIG_LIBUXBOOT_X86_64)=amd64 +ARCH-$(CONFIG_LINUXBOOT_X86_64)=amd64 ARCH-$(CONFIG_LINUXBOOT_X86)=i386 ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64
@@ -39,7 +39,7 @@
get: version if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \ - git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet master; \ + git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet main; \ GOPATH=$(go_path_dir) go get -d -u -v $(uroot_package) || \ echo -e "\n<<u-root package update failed>>\n"; \ else \ diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index e805a07..948bc6a 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -208,7 +208,7 @@ payloads/external/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG) $(MAKE) -C payloads/external/U-Boot \ STABLE_COMMIT_ID=$(CONFIG_UBOOT_STABLE_COMMIT_ID) \ - CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ + CONFIG_UBOOT_MAIN=$(CONFIG_UBOOT_MAIN) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)
# TINT