[PATCH meta-rockchip 0/2] fix 2+ DTB in KERNEL_DEVICETREE and empty /boot without kernel-modules

[PATCH meta-rockchip 0/2] fix 2+ DTB in KERNEL_DEVICETREE and empty /boot without kernel-modules

[Quentin Schulz]

This fixes NONFITDT/UBOOT_EXTLINUX_FDT when KERNEL_DEVICETREE contains
more than one DTB (which is a valid use-case).

This also fixes an empty /boot directly when no kernel-modules are
installed in the image, by explicitly adding kernel-image and
kernel-devicetree packages (the latter only if building !fitImage).

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Quentin Schulz (2):
      rockchip-extlinux.inc: handle multiple DTs in KERNEL_DEVICETREE
      rockchip-extlinux.inc: add kernel and dtb packages to the image

 conf/machine/include/rockchip-extlinux.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
base-commit: 88f2064ca2b83b42a7c8a59616ab80b763ef2485
change-id: 20240522-nonfitdt-multi-dt-a282c5187511

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

[PATCH meta-rockchip 1/2] rockchip-extlinux.inc: handle multiple DTs in KERNEL_DEVICETREE

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

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.

Fixes: 3b51866f2251 ("remove /boot partition")
Fixes: 13316b796814 ("KERNEL_DEVICETREE: 32-bit re-org")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 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 ca33f4c..10bb190 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=root"

-- 
2.45.1

[PATCH meta-rockchip 2/2] rockchip-extlinux.inc: add kernel and dtb packages to the image

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

If an image doesn't include kernel-modules, the kernel-image package
won't be installed by default. This means that no
kernel-image-${KERNEL_IMAGETYPE} package will be pulled in, resulting in
neither fitImage nor Image (or uImage, or zImage, or...) making it to
the filesystem, rendering the image non-bootable.

For non-fitImage scenarios, we currently expect DTB-less kernel images
(no bundle, like in uImage) so we also need to pull in the DTB via the
kernel-devicetree package.

Those packages used to be pulled in by the wic plugin through the
IMAGE_BOOT_FILES variable.

Fixes: 3b51866f2251 ("remove /boot partition")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 conf/machine/include/rockchip-extlinux.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/rockchip-extlinux.inc b/conf/machine/include/rockchip-extlinux.inc
index 10bb190..d6de680 100644
--- a/conf/machine/include/rockchip-extlinux.inc
+++ b/conf/machine/include/rockchip-extlinux.inc
@@ -22,3 +22,4 @@ UBOOT_EXTLINUX_LABELS ?= "default"
 UBOOT_EXTLINUX_MENU_DESCRIPTION:default ?= "${MACHINE}"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-extlinux"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', 'kernel-devicetree', d)}"

-- 
2.45.1

Re: [yocto-patches] [PATCH meta-rockchip 1/2] rockchip-extlinux.inc: handle multiple DTs in KERNEL_DEVICETREE

[Trevor Woerner]

On Wed 2024-05-22 @ 08:26:43 PM, Quentin Schulz via lists.yoctoproject.org wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> 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.
> 
> Fixes: 3b51866f2251 ("remove /boot partition")
> Fixes: 13316b796814 ("KERNEL_DEVICETREE: 32-bit re-org")
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  conf/machine/include/rockchip-extlinux.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Trevor Woerner <twoerner@gmail.com>
Applied to meta-rockchip, master branch. Thanks!

Re: [yocto-patches] [PATCH meta-rockchip 2/2] rockchip-extlinux.inc: add kernel and dtb packages to the image

[Trevor Woerner]

On Wed 2024-05-22 @ 08:26:44 PM, Quentin Schulz via lists.yoctoproject.org wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> If an image doesn't include kernel-modules, the kernel-image package
> won't be installed by default. This means that no
> kernel-image-${KERNEL_IMAGETYPE} package will be pulled in, resulting in
> neither fitImage nor Image (or uImage, or zImage, or...) making it to
> the filesystem, rendering the image non-bootable.
> 
> For non-fitImage scenarios, we currently expect DTB-less kernel images
> (no bundle, like in uImage) so we also need to pull in the DTB via the
> kernel-devicetree package.
> 
> Those packages used to be pulled in by the wic plugin through the
> IMAGE_BOOT_FILES variable.
> 
> Fixes: 3b51866f2251 ("remove /boot partition")
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  conf/machine/include/rockchip-extlinux.inc | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Trevor Woerner <twoerner@gmail.com>
Applied to meta-rockchip, master branch. Thanks!