From eba5339c12a0a6b452759f9e3acdc6ea11c271dd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 13 Jul 2024 16:01:32 +0200 Subject: [PATCH] boot/beaglev-secondboot: remove package The beaglev-secondboot was meant for the BeagleV-Starlight board (beaglev_defconfig) but the support was removed. Remove beaglev-secondboot too. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/beaglev-secondboot/Config.in | 9 ------ .../beaglev-secondboot.hash | 3 -- boot/beaglev-secondboot/beaglev-secondboot.mk | 28 ------------------- 6 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 boot/beaglev-secondboot/Config.in delete mode 100644 boot/beaglev-secondboot/beaglev-secondboot.hash delete mode 100644 boot/beaglev-secondboot/beaglev-secondboot.mk diff --git a/Config.in.legacy b/Config.in.legacy index 78dcabed63..28cfce3ce1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.08" +config BR2_TARGET_BEAGLEV_SECONDBOOT + bool "beaglev-secondboot has been removed" + select BR2_LEGACY + help + The beaglev-secondboot package has been removed after + the beaglev_defconfig removal. + config BR2_PACKAGE_ONEVPL_INTEL_GPU bool "onevpl-intel-gpu has been renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7477a871dc..9bfca9e0d8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3069,7 +3069,6 @@ N: Thomas Petazzoni F: arch/Config.in.arm F: board/stmicroelectronics/stm32mp157c-dk2/ F: boot/beaglev-ddrinit/ -F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ F: configs/stm32mp157c_dk2_defconfig diff --git a/boot/Config.in b/boot/Config.in index 25a50265d2..8f504fee34 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -5,7 +5,6 @@ source "boot/at91bootstrap3/Config.in" source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" source "boot/beaglev-ddrinit/Config.in" -source "boot/beaglev-secondboot/Config.in" source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" diff --git a/boot/beaglev-secondboot/Config.in b/boot/beaglev-secondboot/Config.in deleted file mode 100644 index a9695fc138..0000000000 --- a/boot/beaglev-secondboot/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_TARGET_BEAGLEV_SECONDBOOT - bool "beaglev-secondboot" - depends on BR2_riscv - depends on BR2_HOSTARCH = "x86_64" # host-riscv64-elf-toolchain - help - This package builds the SecondBoot firmware used on the - BeagleV platform. - - https://github.com/starfive-tech/beagle_secondBoot diff --git a/boot/beaglev-secondboot/beaglev-secondboot.hash b/boot/beaglev-secondboot/beaglev-secondboot.hash deleted file mode 100644 index d35d3a3856..0000000000 --- a/boot/beaglev-secondboot/beaglev-secondboot.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 bf152500e9f7e467bb1dee95a2291f9ecfaaebe1d64b93f6d403cfaf50e540e0 beaglev-secondboot-e17302063c9a4b74475b18ff24dd149c27257354.tar.gz -sha256 284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813 LICENSE diff --git a/boot/beaglev-secondboot/beaglev-secondboot.mk b/boot/beaglev-secondboot/beaglev-secondboot.mk deleted file mode 100644 index 7e5f5681f4..0000000000 --- a/boot/beaglev-secondboot/beaglev-secondboot.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# beaglev-secondboot -# -################################################################################ - -# Commit on the 'starfive' branch -BEAGLEV_SECONDBOOT_VERSION = e17302063c9a4b74475b18ff24dd149c27257354 -BEAGLEV_SECONDBOOT_SITE = $(call github,starfive-tech,beagle_secondBoot,$(BEAGLEV_SECONDBOOT_VERSION)) -BEAGLEV_SECONDBOOT_INSTALL_TARGET = NO -BEAGLEV_SECONDBOOT_INSTALL_IMAGES = YES -BEAGLEV_SECONDBOOT_DEPENDENCIES = host-riscv64-elf-toolchain -BEAGLEV_SECONDBOOT_LICENSE = GPL-2.0+ -BEAGLEV_SECONDBOOT_LICENSE_FILES = LICENSE - -define BEAGLEV_SECONDBOOT_BUILD_CMDS - $(MAKE) -C $(@D)/build \ - CROSS_COMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ - SUFFIX=buildroot \ - GIT_VERSION=$(BEAGLEV_SECONDBOOT_VERSION) -endef - -define BEAGLEV_SECONDBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/build/bootloader-JH7100-buildroot.bin.out \ - $(BINARIES_DIR)/bootloader-JH7100-buildroot.bin.out -endef - -$(eval $(generic-package))