From e37f20aa8004feabadfb12a8d5b7909b6f0c276a Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 31 Jan 2021 06:36:47 +0000 Subject: [PATCH] linux: bcm2835-bootloader: dts install compatibility with aarch64 Signed-off-by: Ian Leonard --- packages/linux/package.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 13a63e9948..32506e054e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -275,12 +275,18 @@ makeinstall_target() { # install platform dtbs, but remove upstream kernel dtbs (i.e. without downstream # drivers and decent USB support) as these are not required by LibreELEC - cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb ${INSTALL}/usr/share/bootloader + for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do + if [ -f ${dtb} ]; then + cp -v ${dtb} ${INSTALL}/usr/share/bootloader + fi + done rm -f ${INSTALL}/usr/share/bootloader/bcm283*.dtb + # duplicated in overlays below + safe_remove ${INSTALL}/usr/share/bootloader/overlay_map.dtb # install overlay dtbs - for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtb \ - arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtbo; do + for dtb in arch/arm/boot/dts/overlays/*.dtb \ + arch/arm/boot/dts/overlays/*.dtbo; do cp ${dtb} ${INSTALL}/usr/share/bootloader/overlays 2>/dev/null || : done cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/README ${INSTALL}/usr/share/bootloader/overlays