On Mon Jul 20, 2026 at 9:39 AM CEST, Paul Barker wrote:
> On Sat, 2026-07-18 at 10:52 +0200, Yoann Congal wrote:
>> From: Ryan Eatmon <[email protected]>
>>
>> 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 <[email protected]>
>> Signed-off-by: Mathieu Dubois-Briand <[email protected]>
>> Signed-off-by: Richard Purdie <[email protected]>
>> (cherry picked from commit 3bceb2dabeee13c0a80ddd74ea7ae991606d6772)
>> Signed-off-by: Yoann Congal <[email protected]>
>
> Hi Yoann,
>
> This looks like an enhancement rather than a bug fix. If there is a
> strong reason to backport it though we could take it as it's small, self
> contained and not invasive.
I interpreted the mismatch between KERNEL_DEVICETREE and
FIT_CONF_DEFAULT_DTB as a bug to solve.
But one could argue that each variable has its syntax, a bit weird but
not worthy of a stable fix.
I still think this is worth fixing though.
>
> Does the previous syntax (FIT_CONF_DEFAULT_DTB = "ti_k3-am62p5-sk.dtb")
> still work after this patch?
As I read it, the patch only add a .replace('/', '_') (when
KERNEL_DTBVENDORED="1") so the old syntax should be preserved.
> If we do take this, should we take the accompanying test case [1]?
>
> [1]:
> https://lore.kernel.org/openembedded-core/[email protected]/
Yes, Ryan suggested it but it was not yet merged when I reviewed it.
Now it has merged, I think I should hold the series:
* oe-selftest: fitimage: Do not expect kernel property in DTBO config subnodes
* kernel-fit-image.bbclass: Do not include kernel property in DTBO config
subnodes
* kernel-fit-image.bbclass: Fix operation with KERNEL_DTBVENDORED = "1"
* kernel-fit-image: Add KERNEL_DTBVENDORED support for FIT_CONF_DEFAULT_DTB
... until next wrynose review cycle, and add
* de2e11e6362 - oe-selftest: fitimage: Add tests for KERNEL_DTBVENDORED
from master to test it.
Thanks!
--
Yoann Congal
Smile ECS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#241409):
https://lists.openembedded.org/g/openembedded-core/message/241409
Mute This Topic: https://lists.openembedded.org/mt/120329199/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
