From cf05d46548b89a98d0e261fc7448ff4e6dad3b5f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Thu, 24 Aug 2023 10:51:16 +0200 Subject: [PATCH] aarch64: Keep dtb directory structure from kernel tree in /boot This is the layout expected by the "distro boot" effort in U-Boot. As far as I understand, the contract is: - U-Boot built for `fooboard` by `vendor`, will set the `fdtfile` variable to `vendor/fooboard.dtb` - or more precisely: matching whatever path the dtb is built at in the kernel tree. - A distro (e.g. Infix) then just needs to specify the `fdtdir` in its syslinux config (/boot in our case), and U-Boot will be able to find the correct dtb. --- board/aarch64/rootfs/boot/syslinux/syslinux.conf | 1 + configs/aarch64_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/board/aarch64/rootfs/boot/syslinux/syslinux.conf b/board/aarch64/rootfs/boot/syslinux/syslinux.conf index 33fdbb23..fbc87ac0 100644 --- a/board/aarch64/rootfs/boot/syslinux/syslinux.conf +++ b/board/aarch64/rootfs/boot/syslinux/syslinux.conf @@ -1,3 +1,4 @@ label Infix (aarch64) kernel /boot/Image + fdtdir /boot append ${bootargs_root} ${bootargs_rauc} ${bootargs_log} diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index d1940e34..05a23fc9 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/li BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra marvell/cn9130-crb-A marvell/cn9130-crb-B sparx5_pcb135_emmc_no_psci" BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/dts/microchip/sparx5_pcb135_emmc_no_psci.dts" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y