batocera-linux · bryanforbes · Feb 14, 2026
diff --git a/external.mk b/external.mk
@@ -1,3 +1,4 @@
+include $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/pkg-boot.mk
 include $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/pkg-emulator-info.mk
 include $(sort $(wildcard $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*.mk $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/*/*/*/*/*.mk))
 

diff --git a/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk b/package/batocera/boot/batocera-initramfs/batocera-initramfs.mk
@@ -9,13 +9,14 @@ BATOCERA_INITRAMFS_SITE = http://www.busybox.net/downloads
 BATOCERA_INITRAMFS_SOURCE = busybox-$(BATOCERA_INITRAMFS_VERSION).tar.bz2
 BATOCERA_INITRAMFS_LICENSE = GPLv2
 BATOCERA_INITRAMFS_LICENSE_FILES = LICENSE
+BATOCERA_INITRAMFS_INSTALL_IMAGES = YES
 
 BATOCERA_INITRAMFS_DEPENDENCIES += host-uboot-tools libxcrypt
 BATOCERA_INITRAMFS_CFLAGS = $(TARGET_CFLAGS)
 BATOCERA_INITRAMFS_LDFLAGS = $(TARGET_LDFLAGS)
 
 BATOCERA_INITRAMFS_KCONFIG_FILE = \
-    $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-initramfs/busybox.config
+    $(BATOCERA_INITRAMFS_PKGDIR)/busybox.config
 
 INITRAMFS_DIR=$(BINARIES_DIR)/initramfs
 
@@ -65,7 +66,7 @@ define BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
 	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/starfive/jh7110/initrd/* \
 	    $(INITRAMFS_DIR)/
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_RISCV_EARLY_FIRMWARE
 endif
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_SM8550),y)
@@ -79,7 +80,7 @@ define BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
     cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/qualcomm/sm8550/fsoverlay/lib/firmware/qcom/* \
         $(INITRAMFS_DIR)/lib/firmware/qcom/
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_SM8550_EARLY_FIRMWARE
 endif
 
 ifeq ($(BR2_PACKAGE_BATOCERA_TARGET_H700),y)
@@ -92,13 +93,12 @@ define BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
 	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/board/batocera/allwinner/h700/fsoverlay/lib/firmware/panels/* \
         $(INITRAMFS_DIR)/lib/firmware/panels
 endef
-BATOCERA_INITRAMFS_PRE_INSTALL_TARGET_HOOKS += BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
+BATOCERA_INITRAMFS_PRE_INSTALL_IMAGES_HOOKS += BATOCERA_INITRAMFS_H700_EARLY_FIRMWARE
 endif
 
-define BATOCERA_INITRAMFS_INSTALL_TARGET_CMDS
+define BATOCERA_INITRAMFS_INSTALL_IMAGES_CMDS
 	mkdir -p $(INITRAMFS_DIR)
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-initramfs/init \
-	    $(INITRAMFS_DIR)/init
+	cp $(BATOCERA_INITRAMFS_PKGDIR)/init $(INITRAMFS_DIR)/init
 	$(BATOCERA_INITRAMFS_MAKE_ENV) $(MAKE) $(BATOCERA_INITRAMFS_MAKE_OPTS) -C $(@D) install
 	(cd $(INITRAMFS_DIR) && find . | cpio -H newc -o > $(BINARIES_DIR)/initrd)
 	(cd $(BINARIES_DIR) && mkimage -A $(BATOCERA_INITRAMFS_INITRDA) \

diff --git a/...ocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk b/...ocera/boot/batocera-shim-signed-efi-helpers-ia32/batocera-shim-signed-efi-helpers-ia32.mk
@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_VERSION = 1+15.8+1~deb12u1
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_SITE = https://ftp.debian.org/debian/pool/main/s/shim-helpers-i386-signed
 BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_SOURCE = shim-helpers-i386-signed_$(BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_VERSION)_i386.deb
+BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_HELPERS_IA32_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/fbia32.efi.signed $(BINARIES_DIR)/shim-signed/fbia32.efi

diff --git a/package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk b/package/batocera/boot/batocera-shim-signed-efi-ia32/batocera-shim-signed-efi-ia32.mk
@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_IA32_VERSION = 1.44~1+deb12u1+15.8-1~deb12u1
 BATOCERA_SHIM_SIGNED_EFI_IA32_SITE = https://ftp.debian.org/debian/pool/main/s/shim-signed
 BATOCERA_SHIM_SIGNED_EFI_IA32_SOURCE = shim-signed_$(BATOCERA_SHIM_SIGNED_EFI_IA32_VERSION)_i386.deb
+BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_IA32_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_IA32_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_IA32_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/shimia32.efi.signed $(BINARIES_DIR)/shim-signed/shimia32.efi

diff --git a/package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk b/package/batocera/boot/batocera-shim-signed-efi-x64/batocera-shim-signed-efi-x64.mk
@@ -7,6 +7,7 @@
 BATOCERA_SHIM_SIGNED_EFI_X64_VERSION = 1.58+15.8-0ubuntu1
 BATOCERA_SHIM_SIGNED_EFI_X64_SITE = https://launchpad.net/ubuntu/+archive/primary/+files
 BATOCERA_SHIM_SIGNED_EFI_X64_SOURCE = shim-signed_$(BATOCERA_SHIM_SIGNED_EFI_X64_VERSION)_amd64.deb
+BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_IMAGES = YES
 
 define BATOCERA_SHIM_SIGNED_EFI_X64_EXTRACT_CMDS
 	mkdir -p $(@D)/shim-signed
@@ -16,7 +17,7 @@ endef
 define BATOCERA_SHIM_SIGNED_EFI_X64_BUILD_CMDS
 endef
 
-define BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_TARGET_CMDS
+define BATOCERA_SHIM_SIGNED_EFI_X64_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/shim-signed
 
 	cp $(@D)/shim-signed/usr/lib/shim/fbx64.efi                 $(BINARIES_DIR)/shim-signed/

diff --git a/package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk b/package/batocera/boot/batocera-syslinux-efi/batocera-syslinux-efi.mk
@@ -7,12 +7,14 @@
 BATOCERA_SYSLINUX_EFI_VERSION = 6.04.pre2.r11.gbf6db5b4-2
 BATOCERA_SYSLINUX_EFI_SOURCE =
 BATOCERA_SYSLINUX_EFI_SITE = binaries
+BATOCERA_SYSLINUX_EFI_DEPENDENCIES = host-dosfstools host-mtools
+BATOCERA_SYSLINUX_EFI_INSTALL_IMAGES = YES
 
 define BATOCERA_SYSLINUX_EFI_EXTRACT_CMDS
-	cp -R $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/batocera-syslinux-efi/binaries/* $(@D)
+	cp -R $(BATOCERA_SYSLINUX_EFI_PKGDIR)/binaries/* $(@D)
 endef
 
-define BATOCERA_SYSLINUX_EFI_INSTALL_TARGET_CMDS
+define BATOCERA_SYSLINUX_EFI_INSTALL_IMAGES_CMDS
 	mkdir -p $(BINARIES_DIR)/syslinux/efi64
 	cp $(@D)/bootx64.selfsigned.efi  $(BINARIES_DIR)/syslinux/bootx64.efi
 	cp $(@D)/fbx64.selfsigned.efi    $(BINARIES_DIR)/syslinux/fbx64.efi

diff --git a/package/batocera/boot/rockpro64-blobs/rockpro64-blobs.mk b/package/batocera/boot/rockpro64-blobs/rockpro64-blobs.mk
@@ -1,8 +1,9 @@
 ROCKPRO64_BLOBS_VERSION = 2.0
 ROCKPRO64_BLOBS_SITE = https://github.com/batocera-linux/rockpro64-blobs.git
 ROCKPRO64_BLOBS_SITE_METHOD=git
+ROCKPRO64_BLOBS_INSTALL_IMAGES = YES
 
-define ROCKPRO64_BLOBS_INSTALL_TARGET_CMDS
+define ROCKPRO64_BLOBS_INSTALL_IMAGES_CMDS
 	cp $(@D)/idbloader.img $(BINARIES_DIR)/idbloader-rockpro64.img
 	cp $(@D)/trust.img     $(BINARIES_DIR)/trust-rockpro64.img
 	cp $(@D)/uboot.img     $(BINARIES_DIR)/u-boot-rockpro64.bin

diff --git a/package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk b/package/batocera/boot/uboot-bananapi-m7/uboot-bananapi-m7.mk
@@ -6,17 +6,7 @@
 
 # Version: Built from source - @dmanlfc
 UBOOT_BANANAPI_M7_VERSION = 2024.06
-UBOOT_BANANAPI_M7_SOURCE =
+UBOOT_BANANAPI_M7_BOOT_SRC = idbloader.img u-boot.itb
+UBOOT_BANANAPI_M7_BINARIES_SUBDIR = bananapi-m7
 
-define UBOOT_BANANAPI_M7_BUILD_CMDS
-endef
-
-define UBOOT_BANANAPI_M7_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/bananapi-m7
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/idbloader.img \
-	    $(BINARIES_DIR)/bananapi-m7/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-bananapi-m7/u-boot.itb \
-	    $(BINARIES_DIR)/bananapi-m7/u-boot.itb
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk b/package/batocera/boot/uboot-evb-rk3399/uboot-evb-rk3399.mk
@@ -5,16 +5,6 @@
 ################################################################################
 
 UBOOT_EVB_RK3399_VERSION = 1.0
-UBOOT_EVB_RK3399_SOURCE =
+UBOOT_EVB_RK3399_BOOT_SRC = idbloader.img uboot.img trust.img
 
-define UBOOT_EVB_RK3399_BUILD_CMDS
-endef
-
-define UBOOT_EVB_RK3399_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-evb-rk3399
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/idbloader.img $(BINARIES_DIR)/uboot-evb-rk3399/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/uboot.img $(BINARIES_DIR)/uboot-evb-rk3399/uboot.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-evb-rk3399/trust.img $(BINARIES_DIR)/uboot-evb-rk3399/trust.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk b/package/batocera/boot/uboot-firefly-station-m2/uboot-firefly-station-m2.mk
@@ -5,15 +5,6 @@
 ################################################################################
 
 UBOOT_FIREFLY_STATION_M2_VERSION = 1.0
-UBOOT_FIREFLY_STATION_M2_SOURCE =
+UBOOT_FIREFLY_STATION_M2_BOOT_SRC = idbloader.img uboot.img
 
-define UBOOT_FIREFLY_STATION_M2_BUILD_CMDS
-endef
-
-define UBOOT_FIREFLY_STATION_M2_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-firefly-station-m2
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-m2/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-m2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-m2/uboot.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk b/package/batocera/boot/uboot-firefly-station-p2/uboot-firefly-station-p2.mk
@@ -5,15 +5,6 @@
 ################################################################################
 
 UBOOT_FIREFLY_STATION_P2_VERSION = 1.0
-UBOOT_FIREFLY_STATION_P2_SOURCE =
+UBOOT_FIREFLY_STATION_P2_BOOT_SRC = idbloader.img uboot.img
 
-define UBOOT_FIREFLY_STATION_P2_BUILD_CMDS
-endef
-
-define UBOOT_FIREFLY_STATION_P2_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-firefly-station-p2
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-p2/idbloader.img $(BINARIES_DIR)/uboot-firefly-station-p2/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-firefly-station-p2/uboot.img $(BINARIES_DIR)/uboot-firefly-station-p2/uboot.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk b/package/batocera/boot/uboot-hugsun-x99/uboot-hugsun-x99.mk
@@ -5,16 +5,6 @@
 ################################################################################
 
 UBOOT_HUGSUN_X99_VERSION = 1.0
-UBOOT_HUGSUN_X99_SOURCE =
+UBOOT_HUGSUN_X99_BOOT_SRC = idbloader.bin uboot.img trust.bin
 
-define UBOOT_HUGSUN_X99_BUILD_CMDS
-endef
-
-define UBOOT_HUGSUN_X99_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-hugsun-x99
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/idbloader.bin $(BINARIES_DIR)/uboot-hugsun-x99/idbloader.bin
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/uboot.img $(BINARIES_DIR)/uboot-hugsun-x99/uboot.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-hugsun-x99/trust.bin $(BINARIES_DIR)/uboot-hugsun-x99/trust.bin
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-multiboard/uboot-multiboard.mk b/package/batocera/boot/uboot-multiboard/uboot-multiboard.mk
@@ -14,6 +14,7 @@ UBOOT_MULTIBOARD_DL_SUBDIR = uboot
 UBOOT_MULTIBOARD_SOURCE = u-boot-$(UBOOT_MULTIBOARD_VERSION).tar.bz2
 UBOOT_MULTIBOARD_DEPENDENCIES = host-python3 host-python-setuptools
 UBOOT_MULTIBOARD_DEPENDENCIES += host-swig host-openssl host-gnutls
+UBOOT_MULTIBOARD_INSTALL_IMAGES = YES
 
 ifneq ($(BR2_PACKAGE_BATOCERA_TARGET_H3),y)
 UBOOT_MULTIBOARD_DEPENDENCIES += arm-trusted-firmware
@@ -65,22 +66,28 @@ UBOOT_MULTIBOARD_PATCHES_COMMON = $(wildcard $(UBOOT_MULTIBOARD_PKGDIR)/*.patch)
 UBOOT_MULTIBOARD_CNF_FRAGS_SOC = $(wildcard $(UBOOT_MULTIBOARD_PKGDIR)/$(UBOOT_MULTIBOARD_SOC_DIR)/*.config.fragment)
 UBOOT_MULTIBOARD_PATCHES_SOC = $(wildcard $(UBOOT_MULTIBOARD_PKGDIR)/$(UBOOT_MULTIBOARD_SOC_DIR)/*.patch)
 
-# Use empty extract commands because we extract (and patch, configure, build
-# and install) multiple times in a loop.
-define UBOOT_MULTIBOARD_EXTRACT_CMDS
+define UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS
+	$(foreach config,$(call qstrip,$(BR2_PACKAGE_UBOOT_MULTIBOARD_CONFIGS)),
+		$(call UBOOT_MULTIBOARD_$(1)_FOR_CONFIG,$(config)))
 endef
 
 # Helper macro to extract U-Boot.
 # $(1): the name of U-Boot defconfig without _defconfig part
-define UBOOT_MULTIBOARD_STEP_EXTRACT
+define UBOOT_MULTIBOARD_EXTRACT_FOR_CONFIG
 	@$(call MESSAGE,"Extract U-Boot for $(1)")
 	@mkdir -p $(@D)/source-$(1)
 	@$(TAR) --strip-components=1 -C $(@D)/source-$(1) $(TAR_OPTIONS) $(UBOOT_MULTIBOARD_DL_DIR)/$(UBOOT_MULTIBOARD_SOURCE)
 endef
 
+# Use empty extract commands because we extract (and patch, configure, build
+# and install) multiple times in a loop.
+define UBOOT_MULTIBOARD_EXTRACT_CMDS
+	$(call UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS,EXTRACT)
+endef
+
 # Helper macro to patch U-Boot.
 # $(1): the name of U-Boot defconfig without _defconfig part
-define UBOOT_MULTIBOARD_STEP_PATCH
+define UBOOT_MULTIBOARD_PATCH_FOR_CONFIG
 	@$(call MESSAGE,"Patch U-Boot for $(1)")
 	$(eval UBOOT_MULTIBOARD_PATCHES = $(strip
 		$(UBOOT_MULTIBOARD_PATCHES_COMMON)
@@ -93,10 +100,16 @@ define UBOOT_MULTIBOARD_STEP_PATCH
 	)
 endef
 
+define UBOOT_MULTIBOARD_PATCH_CONFIGS
+	$(call UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS,PATCH)
+endef
+
+UBOOT_MULTIBOARD_POST_PATCH_HOOKS += UBOOT_MULTIBOARD_PATCH_CONFIGS
+
 # Helper macro to configure U-Boot, adaptation of buildroot pkg-kconfig's
 # config and config fragment handling.
 # $(1): the name of U-Boot defconfig without _defconfig part
-define UBOOT_MULTIBOARD_STEP_CONFIGURE
+define UBOOT_MULTIBOARD_CONFIGURE_FOR_CONFIG
 	@$(call MESSAGE,"Configure U-Boot for $(1)")
 	$(eval UBOOT_MULTIBOARD_CNF_FRAGS = $(strip
 		$(UBOOT_MULTIBOARD_CNF_FRAGS_COMMON)
@@ -113,9 +126,13 @@ define UBOOT_MULTIBOARD_STEP_CONFIGURE
 	)
 endef
 
+define UBOOT_MULTIBOARD_CONFIGURE_CMDS
+	$(call UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS,CONFIGURE)
+endef
+
 # Helper macro to build U-Boot, adaptation of buildroot uboot's build.
 # $(1): the name of U-Boot defconfig without _defconfig part
-define UBOOT_MULTIBOARD_STEP_BUILD
+define UBOOT_MULTIBOARD_BUILD_FOR_CONFIG
 	@$(call MESSAGE,"Build U-Boot for $(1)")
 	$(TARGET_CONFIGURE_OPTS) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
@@ -127,26 +144,22 @@ define UBOOT_MULTIBOARD_STEP_BUILD
 			O=$(@D)/build-$(1) $(UBOOT_MULTIBOARD_MAKE_OPTS) all
 endef
 
+define UBOOT_MULTIBOARD_BUILD_CMDS
+	$(call UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS,BUILD)
+endef
 
 # Helper macro to install U-Boot.
 # $(1): the name of U-Boot defconfig without _defconfig part
-define UBOOT_MULTIBOARD_STEP_INSTALL
+define UBOOT_MULTIBOARD_INSTALL_FOR_CONFIG
 	@$(call MESSAGE,"Install U-Boot for $(1)")
 	@mkdir -p $(BINARIES_DIR)/uboot-multiboard/$(1)
 	@$(foreach bin,$(call qstrip,$(BR2_PACKAGE_UBOOT_MULTIBOARD_BINARIES)),
 		cp -f $(@D)/build-$(1)/$(bin) $(BINARIES_DIR)/uboot-multiboard/$(1)/
 	)
 endef
 
-# The build loop.
-define UBOOT_MULTIBOARD_BUILD_CMDS
-	$(foreach config,$(call qstrip,$(BR2_PACKAGE_UBOOT_MULTIBOARD_CONFIGS)),
-		$(call UBOOT_MULTIBOARD_STEP_EXTRACT,$(config))
-		$(call UBOOT_MULTIBOARD_STEP_PATCH,$(config))
-		$(call UBOOT_MULTIBOARD_STEP_CONFIGURE,$(config))
-		$(call UBOOT_MULTIBOARD_STEP_BUILD,$(config))
-		$(call UBOOT_MULTIBOARD_STEP_INSTALL,$(config))
-	)
+define UBOOT_MULTIBOARD_INSTALL_IMAGES_CMDS
+	$(call UBOOT_MULTIBOARD_CALL_STEP_FOR_CONFIGS,INSTALL)
 endef
 
 $(eval $(generic-package))
diff --git a/package/batocera/boot/uboot-nanopi-m6/uboot-nanopi-m6.mk b/package/batocera/boot/uboot-nanopi-m6/uboot-nanopi-m6.mk
@@ -5,17 +5,6 @@
 ################################################################################
 
 UBOOT_NANOPI_M6_VERSION = 2024.04
-UBOOT_NANOPI_M6_SOURCE =
+UBOOT_NANOPI_M6_BOOT_SRC = idbloader.img u-boot.itb
 
-define UBOOT_NANOPI_M6_BUILD_CMDS
-endef
-
-define UBOOT_NANOPI_M6_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-nanopi-m6
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-nanopi-m6/idbloader.img \
-	    $(BINARIES_DIR)/uboot-nanopi-m6/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-nanopi-m6/u-boot.itb \
-	    $(BINARIES_DIR)/uboot-nanopi-m6/u-boot.itb	   
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-odroid-goa/uboot-odroid-goa.mk b/package/batocera/boot/uboot-odroid-goa/uboot-odroid-goa.mk
@@ -7,17 +7,14 @@
 UBOOT_ODROID_GOA_VERSION = 0e26e35cb18a80005b7de45c95858c86a2f7f41e
 UBOOT_ODROID_GOA_SITE = https://github.com/hardkernel/u-boot.git
 UBOOT_ODROID_GOA_SITE_METHOD=git
+UBOOT_ODROID_GOA_BOOT_SRC = idbloader.img uboot.img trust.img
+UBOOT_ODROID_GOA_BOOT_SRC_DIR = $(UBOOT_ODROID_GOA_BUILDDIR)/sd_fuse
+UBOOT_ODROID_GOA_BINARIES_SUBDIR =
 
 UBOOT_ODROID_GOA_DEPENDENCIES = host-toolchain-optional-linaro-aarch64
 
 define UBOOT_ODROID_GOA_BUILD_CMDS
         cd $(@D) && $(@D)/make.sh odroidgoa
 endef
 
-define UBOOT_ODROID_GOA_INSTALL_TARGET_CMDS
-	cp $(@D)/sd_fuse/idbloader.img $(BINARIES_DIR)/idbloader.img
-	cp $(@D)/sd_fuse/uboot.img     $(BINARIES_DIR)/uboot.img
-	cp $(@D)/sd_fuse/trust.img     $(BINARIES_DIR)/trust.img
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))
diff --git a/package/batocera/boot/uboot-odroid-m1/uboot-odroid-m1.mk b/package/batocera/boot/uboot-odroid-m1/uboot-odroid-m1.mk
@@ -5,15 +5,6 @@
 ################################################################################
 
 UBOOT_ODROID_M1_VERSION = 1.0
-UBOOT_ODROID_M1_SOURCE =
+UBOOT_ODROID_M1_BOOT_SRC = idbloader.img u-boot.itb
 
-define UBOOT_ODROID_M1_BUILD_CMDS
-endef
-
-define UBOOT_ODROID_M1_INSTALL_TARGET_CMDS
-	mkdir -p $(BINARIES_DIR)/uboot-odroid-m1
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-odroid-m1/idbloader.img $(BINARIES_DIR)/uboot-odroid-m1/idbloader.img
-	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/boot/uboot-odroid-m1/u-boot.itb $(BINARIES_DIR)/uboot-odroid-m1/u-boot.itb
-endef
-
-$(eval $(generic-package))
+$(eval $(boot-package))