Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/rpi-firmware: drop support for vcdbg

Browse Source 
This tool has been removed from upstream rpi-firmware, so drop the
corresponding option and logic in rpi-firmware.mk.

The tool has been removed by upstream commit
d1fcc26038186aecc1501a0b749833300afba801 ("opt: Remove builds of
deprectated userland tools").

It is Buildorot commit
28e6953ba8 ("package/rpi-firmware: bump
version to 5476720") that did a bump to a version of rpi-firmware that
no longer provided vcdbg.

Cc: Köry Maincent <kory.maincent@bootlin.com>
Cc: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit f53a1af56b8cedda58038413cbb9e621ab01705a)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
Thomas Petazzoni
2025-12-15 23:49:33 +01:00
committed by Thomas Perale
parent f777594d19
commit 9a4ef6c282
3 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2025.02.10" 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 config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
bool "opencv3 ffmpeg support removed" bool "opencv3 ffmpeg support removed"
select BR2_LEGACY select BR2_LEGACY

12
package/rpi-firmware/Config.in
View File

@@ -100,16 +100,4 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
overlays, to support HATs (Hardware Attached on Top, add-on overlays, to support HATs (Hardware Attached on Top, add-on
modules). 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 endif # BR2_PACKAGE_RPI_FIRMWARE

20
package/rpi-firmware/rpi-firmware.mk
View File

@@ -62,26 +62,6 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
endef endef
endif 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 define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
$(RPI_FIRMWARE_INSTALL_BIN) $(RPI_FIRMWARE_INSTALL_BIN)
$(RPI_FIRMWARE_INSTALL_CONFIG) $(RPI_FIRMWARE_INSTALL_CONFIG)