diff --git a/Config.in.legacy b/Config.in.legacy index 598cd9c0ef..9416e9d114 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2025.02.10" +config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG + bool "rpi-firmware vcdbg option removed" + select BR2_LEGACY + help + rpi-firmware upstream has dropped the vcdbg tool + config BR2_PACKAGE_OPENCV3_WITH_FFMPEG bool "opencv3 ffmpeg support removed" select BR2_LEGACY diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index f99c116ca2..4dda33a713 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -100,16 +100,4 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS overlays, to support HATs (Hardware Attached on Top, add-on modules). -config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG - bool "vcdbg" - depends on BR2_arm # prebuilt arm binary, rpi-userland - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_INSTALL_LIBSTDCPP # rpi-userland - help - Install vcdbg, to help debug communication with the GPU. - -comment "vcdbg needs a glibc toolchain w/ C++" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP - endif # BR2_PACKAGE_RPI_FIRMWARE diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 8350d395da..0debb89091 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -62,26 +62,6 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif -# Install prebuilt libraries if RPI_USERLAND not enabled -ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) -define RPI_FIRMWARE_INSTALL_TARGET_LIB - $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libvcos.so \ - $(TARGET_DIR)/usr/lib/libvcos.so - $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libdebug_sym.so \ - $(TARGET_DIR)/usr/lib/libdebug_sym.so -endef -endif - -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y) -define RPI_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0700 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/bin/vcdbg \ - $(TARGET_DIR)/usr/sbin/vcdbg - $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libelftoolchain.so \ - $(TARGET_DIR)/usr/lib/libelftoolchain.so - $(RPI_FIRMWARE_INSTALL_TARGET_LIB) -endef -endif # INSTALL_VCDBG - define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_BIN) $(RPI_FIRMWARE_INSTALL_CONFIG)