From d8c645e8581c3c7b99a0c755ea6572cb8aabbf23 Mon Sep 17 00:00:00 2001 From: Jybz Date: Fri, 19 Feb 2021 16:30:50 +0100 Subject: Use dtb from /boot directory (provided by the rpm) instead of a list from config file. --- platforms/rpi-aarch64/mageia4arm.cfg | 2 -- platforms/rpi-aarch64/specialFunctions.sh | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platforms/rpi-aarch64/mageia4arm.cfg b/platforms/rpi-aarch64/mageia4arm.cfg index a31a5c1..8c1111d 100644 --- a/platforms/rpi-aarch64/mageia4arm.cfg +++ b/platforms/rpi-aarch64/mageia4arm.cfg @@ -80,8 +80,6 @@ https://github.com/raspberrypi/firmware/blob/master/boot/fixup4x.dat #Rpi4 U_BOOT="rpi_arm64" -DTB="bcm2837-rpi-3-b.dtb bcm2837-rpi-3-a-plus.dtb bcm2837-rpi-3-b.dtb bcm2837-rpi-3-b-plus.dtb bcm2711-rpi-4-b.dtb bcm2837-rpi-cm3-io3.dtb" - FIRMWARE_DOWNLOAD_URL="https://github.com/raspberrypi/firmware/raw/master/boot/bootcode.bin https://github.com/raspberrypi/firmware/raw/master/boot/fixup.dat https://github.com/raspberrypi/firmware/raw/master/boot/fixup4.dat diff --git a/platforms/rpi-aarch64/specialFunctions.sh b/platforms/rpi-aarch64/specialFunctions.sh index c990535..8209db3 100755 --- a/platforms/rpi-aarch64/specialFunctions.sh +++ b/platforms/rpi-aarch64/specialFunctions.sh @@ -59,12 +59,13 @@ function copyingCustomSystem() print_info "copying boot files to ${BOOT}" #As there is no ownership in FAT FS. - cp -a --no-preserve=ownership ${CONFIG_PATH}/boot/* "${BOOT}/" + cp -av --no-preserve=ownership ${CONFIG_PATH}/boot/* "${BOOT}/" print_info "copying dtb files to ${BOOT}" - for f in ${DTB}; do - cp --preserve=mode ${BUILD_PATH}/usr/lib64/linux-*/${f} "${BOOT}/" - done + cp -v --preserve=mode "${BUILD_PATH}/boot/"*.dtb "${BOOT}/" +# for f in ${DTB}; do +# cp --preserve=mode ${BUILD_PATH}/usr/lib64/linux-*/${f} "${BOOT}/" +# done return 0 } -- cgit v1.2.1