From d80fa46c42f21693dec492d6156e418570a54eea Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 22 May 2024 20:26:43 +0200 Subject: [PATCH] rockchip-extlinux.inc: handle multiple DTs in KERNEL_DEVICETREE KERNEL_DEVICETREE may contain more than one DTB, the first one being the default one. Therefore, let's split on space first, to get the first DTB before stripping the directory name from it. This doesn't add support for creating multiple labels for each DTB in KERNEL_DEVICETREE. Reviewed-by: Trevor Woerner Fixes: 3b51866f2251 ("remove /boot partition") Fixes: 13316b796814 ("KERNEL_DEVICETREE: 32-bit re-org") Signed-off-by: Quentin Schulz --- conf/machine/include/rockchip-extlinux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc index ab46b76..6286e98 100644 --- a/conf/machine/include/rockchip-extlinux.inc +++ b/conf/machine/include/rockchip-extlinux.inc @@ -9,7 +9,7 @@ # $UBOOT_EXTLINUX_FDTDIR/rockchip/$KERNEL_DEVICETREE but rather at # $UBOOT_EXTLINUX_FDTDIR/$KERNEL_DEVICETREE therefore we need to strip off # the 'rockchip/' part for extlinux non-fitImage builds -NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split('/')[1]}" +NONFITDT ?= "${@d.getVar('KERNEL_DEVICETREE').split()[0].split('/')[1]}" UBOOT_EXTLINUX ?= "1" UBOOT_EXTLINUX_ROOT ?= "root=PARTLABEL=rootfsA"