From 718a7ae62dc59ece08f8b7849e691873e9216258 Mon Sep 17 00:00:00 2001 From: Elias Souza Date: Thu, 16 Feb 2023 21:04:09 -0300 Subject: [PATCH] payloads/Yabits: Remove deprecated Yabits Payload Yabits is no longer maintained and git repo is archived. Yabits has not been maintained for a long time, the project is apparently closed. Change-Id: Ida0bb79342448510d2c309339fabbe8066eca73c Signed-off-by: Elias Souza Reviewed-on: https://review.coreboot.org/c/coreboot/+/72463 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- Documentation/contributing/project_ideas.md | 2 +- .../releases/coreboot-4.20-relnotes.md | 2 +- payloads/Makefile.inc | 1 - payloads/external/Makefile.inc | 11 ---- payloads/external/Yabits/Kconfig | 47 ---------------- payloads/external/Yabits/Kconfig.name | 11 ---- payloads/external/Yabits/Makefile | 56 ------------------- src/sbom/Kconfig | 2 +- src/sbom/TAGS | 1 - 9 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 payloads/external/Yabits/Kconfig delete mode 100644 payloads/external/Yabits/Kconfig.name delete mode 100644 payloads/external/Yabits/Makefile diff --git a/Documentation/contributing/project_ideas.md b/Documentation/contributing/project_ideas.md index 700373b0fe..3e24a3bfd8 100644 --- a/Documentation/contributing/project_ideas.md +++ b/Documentation/contributing/project_ideas.md @@ -88,7 +88,7 @@ across architectures. While we have a rather big set of payloads for x86 based platforms, all other architectures are rather limited. Improve the situation by porting a payload to one of the platforms, for example GRUB2, U-Boot (the UI part), edk2, -yabits, FILO, or Linux-as-Payload. +FILO, or Linux-as-Payload. Since this is a bit of a catch-all idea, an application to GSoC should pick a combination of payload and architecture to support. diff --git a/Documentation/releases/coreboot-4.20-relnotes.md b/Documentation/releases/coreboot-4.20-relnotes.md index ebaad659c9..34dc406b54 100644 --- a/Documentation/releases/coreboot-4.20-relnotes.md +++ b/Documentation/releases/coreboot-4.20-relnotes.md @@ -24,7 +24,7 @@ Significant or interesting changes ### Add changes that need a full description here - +* Remove Yabits payload, Yabits project is deprecated and archived. Additional coreboot changes --------------------------- diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 41e3f9fca3..e735443a76 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -27,7 +27,6 @@ payloads/external/tint \ payloads/external/edk2 \ payloads/external/GRUB2 \ payloads/external/LinuxBoot \ -payloads/external/Yabits \ payloads/external/skiboot \ payloads/external/coreDOOM \ diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index a2d2f505e2..91fce58f92 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -399,17 +399,6 @@ payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot payloads/external/LinuxBoot/linuxboot/uImage: linuxboot payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio: linuxboot -# Yabits - -payloads/external/Yabits/uefi/build/uefi.elf yabits: - $(MAKE) -C payloads/external/Yabits all \ - XGCCPATH="$(XGCCPATH)" \ - CONFIG_YABITS_REVISION=$(CONFIG_YABITS_REVISION) \ - CONFIG_YABITS_REVISION_ID=$(CONFIG_YABITS_REVISION_ID) \ - CONFIG_YABITS_MASTER=$(CONFIG_YABITS_MASTER) \ - CONFIG_YABITS_STABLE=$(CONFIG_YABITS_STABLE) \ - MFLAGS= MAKEFLAGS= - # BOOTBOOT payloads/external/BOOTBOOT/bootboot/dist/bootbootcb.elf: diff --git a/payloads/external/Yabits/Kconfig b/payloads/external/Yabits/Kconfig deleted file mode 100644 index cd1ade8df6..0000000000 --- a/payloads/external/Yabits/Kconfig +++ /dev/null @@ -1,47 +0,0 @@ -if PAYLOAD_YABITS - -choice - prompt "Yabits version" - default YABITS_STABLE - -config YABITS_STABLE - bool "Stable" - help - Stable Yabits version. - - For reproducible builds, this option must be selected. - -config YABITS_MASTER - bool "Master" - help - Newest version. - - This option will fetch the newest version of the Yabits code, - updating as new changes are committed. This makes the build - non-reproducible, as it can fetch different code each time. - -config YABITS_REVISION - bool "git revision" - help - Select this option if you have a specific commit or branch - that you want to use as the revision from which to - build Yabits. Using a branch name makes the build - non-reproducible, as it can fetch different code as the - branch changes. - - You will be able to specify the name of a branch or a commit id - later. - -endchoice - -config YABITS_REVISION_ID - string "Insert a commit's SHA-1 or a branch name" - depends on YABITS_REVISION - default "origin/master" - help - The commit's SHA-1 or branch name of the revision to use. - -config PAYLOAD_FILE - default "payloads/external/Yabits/uefi/build/uefi.elf" - -endif diff --git a/payloads/external/Yabits/Kconfig.name b/payloads/external/Yabits/Kconfig.name deleted file mode 100644 index 84f860f296..0000000000 --- a/payloads/external/Yabits/Kconfig.name +++ /dev/null @@ -1,11 +0,0 @@ -config PAYLOAD_YABITS - bool "Yabits - Yet another UEFI Bootloader (Under Development)" - depends on ARCH_X86 - help - Yabits - yabits.github.io - yabits is a pure UEFI coreboot payload. Compared with - TianoCore, it is fast and lightweight. yabits is based on the - part of Minoca OS. It can run GRUB2, Linux, OpenBSD, and other - UEFI applications. - - It is still under the development and not ready for production. diff --git a/payloads/external/Yabits/Makefile b/payloads/external/Yabits/Makefile deleted file mode 100644 index adac77e810..0000000000 --- a/payloads/external/Yabits/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -TAG-$(CONFIG_YABITS_MASTER)=origin/master -NAME-$(CONFIG_YABITS_MASTER)=Master -TAG-$(CONFIG_YABITS_STABLE)=d25abb067431dee9af9f8a874a209730ab7f0e91 -NAME-$(CONFIG_YABITS_STABLE)=Stable -TAG-$(CONFIG_YABITS_REVISION)=$(CONFIG_YABITS_REVISION_ID) - -project_name=Yabits -project_dir=$(CURDIR)/uefi -project_git_repo=https://github.com/yabits/uefi.git -LIBCONFIG_PATH="../../../libpayload" - -all: build - -$(project_dir): - echo " Cloning $(project_name) from Git" - git clone $(project_git_repo) $(project_dir) - -fetch: $(project_dir) -ifeq ($(TAG-y),) - echo "Error: The specified tag is invalid" -ifeq ($(CONFIG_YABITS_REVISION),y) - echo "Error: There is no revision specified for $(project_name)" - false -endif - false -endif - -cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; \ - if [ $$? -ne 0 ] || [ "$(TAG-y)" = "origin/master" ]; 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 branch -D coreboot 2>/dev/null; \ - git checkout -b coreboot $(TAG-y) - -build: checkout - echo " MAKE $(project_name) $(NAME-y)" - $(if $(wildcard uefi/.xcompile),,$(shell bash ../../../util/xcompile/xcompile > uefi/.xcompile)) - $(MAKE) -C $(project_dir) defconfig LIBCONFIG_PATH=$(LIBCONFIG_PATH) XGCC=$(XGCCPATH) - $(MAKE) -C $(project_dir) all LIBCONFIG_PATH=$(LIBCONFIG_PATH) XGCC=$(XGCCPATH) - -clean: - test -d $(project_dir) && $(MAKE) -C $(project_dir) clean LIBCONFIG_PATH=$(LIBCONFIG_PATH) XGCC=$(XGCCPATH) || exit 0 - -distclean: - rm -rf $(project_dir) - -print-repo-info: - echo "$(project_git_repo) $(project_dir)" - -.PHONY: all build checkout clean distclean fetch print-repo-info diff --git a/src/sbom/Kconfig b/src/sbom/Kconfig index ed83c1e599..43fde4c72c 100644 --- a/src/sbom/Kconfig +++ b/src/sbom/Kconfig @@ -41,7 +41,7 @@ config SBOM_PAYLOAD config SBOM_PAYLOAD_GENERATE bool "Auto-generate generic SBOM info for payload" - depends on SBOM_PAYLOAD && (PAYLOAD_BOOTBOOT || PAYLOAD_DEPTHCHARGE || PAYLOAD_FILO || PAYLOAD_GRUB2 || PAYLOAD_LINUXBOOT || PAYLOAD_SEABIOS || PAYLOAD_SKIBOOT || PAYLOAD_UBOOT || PAYLOAD_YABITS) + depends on SBOM_PAYLOAD && (PAYLOAD_BOOTBOOT || PAYLOAD_DEPTHCHARGE || PAYLOAD_FILO || PAYLOAD_GRUB2 || PAYLOAD_LINUXBOOT || PAYLOAD_SEABIOS || PAYLOAD_SKIBOOT || PAYLOAD_UBOOT) default y help Select this option if you want coreboot to generate and include diff --git a/src/sbom/TAGS b/src/sbom/TAGS index dec4859d0b..776e265131 100644 --- a/src/sbom/TAGS +++ b/src/sbom/TAGS @@ -8,7 +8,6 @@ payload-LinuxBoot: uuidgen --name linuxboot --namespace "6ba7b810-9dad- payload-SeaBIOS: uuidgen --name seabios --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 payload-skiboot: uuidgen --name skiboot --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 payload-U-Boot: uuidgen --name uboot --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 -payload-Yabits: uuidgen --name yabits --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 coreboot: uuidgen --name coreboot --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 generic-ec: uuidgen --name generic-ec --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1 intel-me: uuidgen --name intel-me --namespace "6ba7b810-9dad-11d1-80b4-00c04fd430c8" --sha1