From ff0bd00468fe9f935d9385c084ff05539ea68c7e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 5 Oct 2025 15:49:49 +0200 Subject: [PATCH] boot/s500-bootloader: drop package With the removal of the roseapplepi defconfig in commit 56091a581854a ("configs/roseapplepi: remove defconfig, broken") there are no (in-tree) users of the s500-bootloader binary blob package, so drop it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++ boot/Config.in | 1 - boot/s500-bootloader/Config.in | 17 ------------ boot/s500-bootloader/s500-bootloader.hash | 2 -- boot/s500-bootloader/s500-bootloader.mk | 34 ----------------------- utils/genrandconfig | 5 ---- 6 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 boot/s500-bootloader/Config.in delete mode 100644 boot/s500-bootloader/s500-bootloader.hash delete mode 100644 boot/s500-bootloader/s500-bootloader.mk diff --git a/Config.in.legacy b/Config.in.legacy index e10fd95f8d..329336fa2a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2026.02" +config BR2_TARGET_S500_BOOTLOADER + bool "s500-bootloader" + select BR2_LEGACY + help + s500-bootloader package has been removed + config BR2_PACKAGE_OPENCV3_WITH_FFMPEG bool "opencv3 ffmpeg support removed" select BR2_LEGACY diff --git a/boot/Config.in b/boot/Config.in index d3e1b9c055..6816531be9 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" -source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" diff --git a/boot/s500-bootloader/Config.in b/boot/s500-bootloader/Config.in deleted file mode 100644 index 7bb689f305..0000000000 --- a/boot/s500-bootloader/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_TARGET_S500_BOOTLOADER - bool "s500-bootloader" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_HOSTARCH_NEEDS_IA32_LIBS - help - 1st level bootloader for Actions Semiconductor S500 SoC. - - https://github.com/xapp-le/owl - -config BR2_TARGET_S500_BOOTLOADER_BOARD - string "board to configure for" - depends on BR2_TARGET_S500_BOOTLOADER - help - Specify the board to configure the bootloader for. - This should be the name of a directory under s500/boards - containing a suitable bootloader.ini file. diff --git a/boot/s500-bootloader/s500-bootloader.hash b/boot/s500-bootloader/s500-bootloader.hash deleted file mode 100644 index 2ebd933e52..0000000000 --- a/boot/s500-bootloader/s500-bootloader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz diff --git a/boot/s500-bootloader/s500-bootloader.mk b/boot/s500-bootloader/s500-bootloader.mk deleted file mode 100644 index bc87b091c7..0000000000 --- a/boot/s500-bootloader/s500-bootloader.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# s500-bootloader -# -################################################################################ - -S500_BOOTLOADER_VERSION = a8d7fa1d9a7f353ec4613febf30f4ca99a10a106 -S500_BOOTLOADER_SITE = $(call github,xapp-le,owl,$(S500_BOOTLOADER_VERSION)) -S500_BOOTLOADER_LICENSE = PROPRIETARY -S500_BOOTLOADER_INSTALL_TARGET = NO -S500_BOOTLOADER_INSTALL_IMAGES = YES - -S500_BOOTLOADER_BOARD = $(call qstrip,$(BR2_TARGET_S500_BOOTLOADER_BOARD)) - -define S500_BOOTLOADER_BUILD_CMDS - cd $(@D) && ./tools/utils/bootloader_pack \ - s500/bootloader/bootloader.bin \ - s500/boards/$(S500_BOOTLOADER_BOARD)/bootloader.ini \ - s500-bootloader.bin -endef - -define S500_BOOTLOADER_INSTALL_IMAGES_CMDS - $(INSTALL) -m 0644 -D $(@D)/s500-bootloader.bin \ - $(BINARIES_DIR)/s500-bootloader.bin -endef - -$(eval $(generic-package)) - -ifeq ($(BR2_TARGET_S500_BOOTLOADER)$(BR_BUILDING),yy) -# we NEED a board name -ifeq ($(S500_BOOTLOADER_BOARD),) -$(error No s500-bootloader board specified. Check your BR2_TARGET_S500_BOOTLOADER settings) -endif -endif diff --git a/utils/genrandconfig b/utils/genrandconfig index ac80982f63..5ebd552a1d 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -362,11 +362,6 @@ async def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') - if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ - 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: - configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') - configlines.remove('BR2_TARGET_S500_BOOTLOADER_BOARD=""\n') - if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: