bcm28xx-bootloader: remove proprietary vcdbg, use vclog from bcm28xx-utils

package/bcm28xx-bootloader/Makefile

@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		bcm28xx-bootloader
 # not cloned, local src directory used
 PKG_VERSION:=		1e403e23baab5673f0494a200f57cd01287d5b1a
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_DESCR:=		bootloader for bcm28xx
 PKG_SECTION:=		base/boot
 PKG_URL:=		https://github.com/raspberrypi/firmware
@@ -19,17 +19,11 @@ PKGCD_DEFAULT:=		default bootloader
 PKGCD_EXTRA:=		bootloader with extra features and codecs
 PKGCD_CUTDOWN:=		cut down bootloader
 
-PKG_SUBPKGS:=		BCM28XX_BOOTLOADER BCM28XX_DEBUGTOOL
-PKGSD_BCM28XX_DEBUGTOOL:=	bcm28xx debugtool (vcdbg)
-PKGSC_BCM28XX_DEBUGTOOL:=	sys/hw
-PKGSS_BCM28XX_DEBUGTOOL:=	bcm28xx-vc-debug bcm28xx-vc-libs
-
 NO_DISTFILES:=		1
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BCM28XX_BOOTLOADER,bcm28xx-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,BCM28XX_DEBUGTOOL,bcm28xx-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM28XX_DEBUGTOOL)))
 
 CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
@@ -73,7 +67,11 @@ endif
 	printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y)
-	printf "dtoverlay=vc4-kms-v3d\n" >> \
+	printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \
+		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y)
+	printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
 ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),)
@@ -146,10 +144,5 @@ ifneq ($(ADK_RUNTIME_VC1_KEY),)
 	printf "decode_WVC1=$(ADK_RUNTIME_VC1_KEY)\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
-ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y)
-	$(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin
-	$(INSTALL_BIN) ./files/vcdbg \
-		$(IDIR_BCM28XX_DEBUGTOOL)/usr/bin
-endif
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk