From c618345cf8814479bdaeaf7c220e53900f7e0fec Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 11 Jul 2023 09:57:56 +0000 Subject: [PATCH] linux: dts and built dtb files have been moved in linux-6.5 Additional folder depth required for arm dtb files since linux-6.5. The dtb files the were in arch/arm/boot/dts are now in arch/arm/boot/dts/nxp/imx. This is increase of 2 directory levels. For the arm/boot/dts directory {intel,nxp,ti} all have additional subdirectories for the different cpus. For arm64/boot/dts only broadcom has subdirectories. iMX8 dtb files remain in arch/arm64/boot/dts/freescale, thus did not trigger the build failure. --- packages/linux/package.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 050b923ef3..475c21e68f 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -286,7 +286,9 @@ makeinstall_target() { if [ "${BOOTLOADER}" = "u-boot" ]; then mkdir -p ${INSTALL}/usr/share/bootloader - for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do + for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb \ + 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 @@ -302,7 +304,9 @@ 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 - for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do + for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb \ + 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