kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED = "1"
PATCH v2 1/1 kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED = "1"
In the case KERNEL_DTBVENDORED = "1" , the fitImage configuration subnode names used to contain the vendor prefix in OE 5.0 , e.g.:
"
$ mkimage -l fitImage
...
Configuration 0 (conf-freescale_imx8mn-board.dtb)
^^^^^^^^^^
...
"With OE 6.0 this is no longer the case and KERNEL_DTBVENDORED = "1" and KERNEL_DTBVENDORED = "0" behave exactly the same way:
"
$ mkimage -l fitImage ... Configuration 0 (conf-imx8mn-board.dtb) ... "
Users depend on the correct configuration subnode names as those are used in the U-Boot "bootm" command when booting fitImages.
Fix this by converting each entry in the KERNEL_DEVICETREE list into the configuration subnode name by replacing all of its path separators with underscores.
---
Cc: Adrian Freihofer <[email protected]>
Cc: Mathieu Dubois-Briand <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Yoann Congal <[email protected]>
---
NOTE: This should ideally be added into OE 6.0 too
---
V2: Invert the conditional to handle case where KERNEL_DTBVENDORED
is not defined, and to pass oe fitImage selftest
--- meta/classes-recipe/kernel-fit-image.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta/classes-recipe/kernel-fit-image.bbclass +8 -1
@@ -94,6 +94,13 @@ python do_compile() { for dtb in kernel_devicetree.split(): # In deploy_dir the DTBs are without sub-directories also with KERNEL_DTBVENDORED = "1" dtb_name = os.path.basename(dtb) + # With vendored DTs, use the DT name as listed in KERNEL_DEVICETREE + # and replace any path separators with underscores, this behaves the + # same way as KERNEL_DTBVENDORED = "1" did in OE 5.0 and older. + if d.getVar('KERNEL_DTBVENDORED') != "1": + conf_name = dtb_name + else: + conf_name = dtb.replace('/', '_') # Skip DTB if it's also provided in EXTERNAL_KERNEL_DEVICETREE directory if external_kernel_devicetree:
@@ -103,7 +110,7 @@ python do_compile() { # Copy the dtb or dtbo file into the FIT image assembly directory shutil.copyfile(os.path.join(kernel_deploydir, dtb_name), dtb_name) - root_node.fitimage_emit_section_dtb(dtb_name, dtb_name, + root_node.fitimage_emit_section_dtb(conf_name, dtb_name, d.getVar("UBOOT_DTB_LOADADDRESS"), d.getVar("UBOOT_DTBO_LOADADDRESS")) if external_kernel_devicetree:
Signature · 1 line
2.53.0