From 0968ae683fe6b9f0780e84c0e80cc3f86883cda7 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 18 Jan 2024 15:18:32 -0600 Subject: [PATCH] The dtb files wander around the linux source tree, so use find. I have no idea why Linux 6.7 decided the dtb path now needs "arm" it _twice_, but the move broke the armv5l build, so... --- mkroot/mkroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index 50ff1098..5c19a5b5 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -197,7 +197,7 @@ get_target_config() QEMU="arm -M versatilepb -net nic,model=rtl8139 -net user" KARCH=arm KARGS=ttyAMA0 VMLINUX=arch/arm/boot/zImage KCONF=CPU_ARM926T,MMU,VFP,ARM_THUMB,AEABI,ARCH_VERSATILE,ATAGS,DEPRECATED_PARAM_STRUCT,ARM_ATAG_DTB_COMPAT,ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND,SERIAL_AMBA_PL011,SERIAL_AMBA_PL011_CONSOLE,RTC_CLASS,RTC_DRV_PL031,RTC_HCTOSYS,PCI,PCI_VERSATILE,BLK_DEV_SD,SCSI,SCSI_LOWLEVEL,SCSI_SYM53C8XX_2,SCSI_SYM53C8XX_MMIO,NET_VENDOR_REALTEK,8139CP,SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 - DTB=arch/arm/boot/dts/versatile-pb.dtb + DTB=versatile-pb.dtb elif [ "$CROSS" == armv7l ] || [ "$CROSS" == aarch64 ]; then if [ "$CROSS" == aarch64 ]; then QEMU="aarch64 -M virt -cpu cortex-a57" @@ -312,7 +312,7 @@ else # Build kernel. Copy config, device tree binary, and kernel binary to output make ARCH=$KARCH CROSS_COMPILE="$CROSS_COMPILE" -j $(nproc) all || exit 1 - [ -n "$DTB" ] && { cp "$DTB" "$OUTPUT/linux.dtb" || exit 1 ;} + [ -n "$DTB" ] && { cp "$(find -name $DTB)" "$OUTPUT/linux.dtb" || exit 1 ;} if [ -n "$MODULES" ]; then make ARCH=$KARCH INSTALL_MOD_PATH=modz modules_install && (cd modz && find lib/modules | cpio -o -H newc -R +0:+0 ) | gzip \ -- 2.39.2