From ad6023adec81d0e81e00a6ffbf4f742c8aab57ed Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 2 Jan 2024 14:46:25 +0100 Subject: [PATCH] scripts/image: Fix RPi4 and RPi5 noobs build When making the boodloader files optional I forgot to remove the code that unconditionally copies the bootloader files which broke noobs build for RPi4 and RPi5. Drop the code, the files are already copied by the for loop above. Signed-off-by: Matthias Reichl --- scripts/image | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/image b/scripts/image index f01f576038..2a17db405b 100755 --- a/scripts/image +++ b/scripts/image @@ -426,10 +426,6 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then fi done - cp -PR ${INSTALL}/usr/share/bootloader/bootcode.bin ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ - cp -PR ${INSTALL}/usr/share/bootloader/fixup.dat ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ - cp -PR ${INSTALL}/usr/share/bootloader/start.elf ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ - # Copy system files cp ${TARGET_IMG}/${IMAGE_NAME}.system ${RELEASE_DIR}/${NOOBS_DISTRO}/System/SYSTEM cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/${NOOBS_DISTRO}/System/kernel.img