diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index 0a93e3133..c061db792 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -51,6 +51,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
index ec9cdaa27..70736b355 100644
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -51,6 +51,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
index c019083b4..b25f47c82 100644
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -51,6 +51,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_NIC_RTL_815X=y
 BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
diff --git a/buildroot-external/package/rpi-firmware/rpi-firmware.mk b/buildroot-external/package/rpi-firmware/rpi-firmware.mk
deleted file mode 100644
index aa4687488..000000000
--- a/buildroot-external/package/rpi-firmware/rpi-firmware.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-# rpi-firmware
-#
-################################################################################
-
-ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y)
-RPI_FIRMWARE_BOOT_FILES = \
-	start4.elf \
-	start4x.elf \
-	start4cd.elf \
-	fixup4.dat \
-	fixup4x.dat \
-	fixup4cd.dat
-else
-RPI_FIRMWARE_BOOT_FILES = \
-	start.elf \
-	start_x.elf \
-	start_cd.elf \
-	fixup.dat \
-	fixup_x.dat \
-	fixup_cd.dat
-endif
-
-define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
-	$(foreach firmware,$(RPI_FIRMWARE_BOOT_FILES), \
-		$(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware)
-	)
-	$(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN)
-	$(RPI_FIRMWARE_INSTALL_DTB)
-	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS)
-endef