@@ -55,6 +55,13 @@ FIT_KERNEL_SIGN_ENABLE ?= "${UBOOT_SIGN_ENABLE}"
FIT_KERNEL_SIGN_KEYNAME ?= "${UBOOT_SIGN_KEYNAME}"
FIT_KERNEL_SIGN_KEYDIR ?= "${UBOOT_SIGN_KEYDIR}"
+def apply_dtbvendored(d,dtb):
+ if d.getVar('KERNEL_DTBVENDORED') != "1":
+ mapped_name = os.path.basename(dtb)
+ else:
+ mapped_name = dtb.replace('/', '_')
+ return mapped_name
+
python do_compile() {
import shutil
import oe.fitimage
@@ -97,10 +104,7 @@ python do_compile() {
# 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('/', '_')
+ conf_name = apply_dtbvendored(d, dtb)
# Skip DTB if it's also provided in EXTERNAL_KERNEL_DEVICETREE directory
if external_kernel_devicetree:
@@ -195,8 +199,15 @@ python do_compile() {
loadable_loadaddress,
loadable_entrypoint)
+ # Figure out if we have a default dtb and if we need to honor the
+ # KERNEL_DTBVENDORED variable to tweak the name to match what will be
+ # in the fitImage.
+ default_dtb = d.getVar("FIT_CONF_DEFAULT_DTB")
+ if default_dtb:
+ default_dtb = apply_dtbvendored(d, default_dtb)
+
# Generate the configuration section
- root_node.fitimage_emit_section_config(d.getVar("FIT_CONF_DEFAULT_DTB"), d.getVar("FIT_CONF_MAPPINGS"))
+ root_node.fitimage_emit_section_config(default_dtb, d.getVar("FIT_CONF_MAPPINGS"))
# Write the its file
root_node.write_its_file(itsfile)
When specifying a FIT_CONF_DEFAULT_DTB for a machine, you have to exactly align the name with what will be in the fitImage file or you will get a build error. If you also turn on KERNEL_DTBVENDORED then you must also specify the vendor directory as part of the dtb name that you want for the default, but you must manually do the same mapping that the kernel-fit-image class is doing when it generates the fit-image.its file. This patch just adds the same logic to figure out the value for the requested default dtb and eliminate the need to understand the internal mapping of the class. It should make specifying the value more intuitive. The same value that you put in the KERNEL_DEVICETREE can be used in the FIT_CONF_DEFAULT_DTB and the new code will correctly honor the KERNEL_DTBVENDORED setting. Before: KERNEL_DEVICETREE = " ti/k3-am62p5-sk.dtb \ ... \ " FIT_CONF_DEFAULT_DTB = "ti_k3-am62p5-sk.dtb" After: KERNEL_DEVICETREE = " ti/k3-am62p5-sk.dtb \ ... \ " FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb" Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- v2: Created apply_dtbvendored function to handle the mapping to make sure consistency in the multiple places the mapping is needed. meta/classes-recipe/kernel-fit-image.bbclass | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)