Hi, -----Original Message----- > From: [email protected] <[email protected]> > Sent: Wednesday, March 6, 2024 5:42 PM > To: [email protected] > Cc: [email protected]; Denis OSTERLAND-HEIM <[email protected]>; Christian Taedcke <[email protected]> > Subject: [EXT] [OE-core][PATCH v2] kernel-fitImage: only include valid compatible line > > [EXTERNAL EMAIL] > > > From: Christian Taedcke <[email protected]> > > Without this commit the configuration node includes the compatible line 'compatible = [00];' if EXTERNAL_KERNEL_DEVICETREE is not defined, i.e. if PREFERRED_PROVIDER_virtual/dtb is not used. Right. This should definetly should check for kernel path, too. This patch adds the savety net. To get it working in all cases (external, internal, KERNEL_DTBVENDORED=True/False), I guess the compatible string have to be extracted in fitimage_assemble() and passed to fitimage_emit_section_config(). But that´s a story for a nother patch ;-)
> This prevents u-boot from using this configuration and it prints the
message "Could not find configuration node".
>
> An additional check also ensures that the written compatible line never
contains an empty compatible.
Ack
>
> The functionality to add the compatible line was added in commit
> f4c82fb6da89 ("kernel-fitImage: add machine compatible to config
section").
Fixes: f4c82fb6da89 ("kernel-fitImage: add machine compatible to config
section")
>
> Signed-off-by: Christian Taedcke <[email protected]>
Reviewed-by: Denis OSTERLAND-HEIM <[email protected]>
Regards, Denis
> ---
> meta/classes-recipe/kernel-fitimage.bbclass | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes-recipe/kernel-fitimage.bbclass
b/meta/classes-recipe/kernel-fitimage.bbclass
> index 7e30a5d47e..4b74ddc201 100644
> --- a/meta/classes-recipe/kernel-fitimage.bbclass
> +++ b/meta/classes-recipe/kernel-fitimage.bbclass
> @@ -421,6 +421,7 @@ fitimage_emit_section_config() {
> bootscr_line=""
> setup_line=""
> default_line=""
> + compatible_line=""
>
> dtb_image_sect=$(symlink_points_below $dtb_image
"${EXTERNAL_KERNEL_DEVICETREE}")
> if [ -z "$dtb_image_sect" ]; then
> @@ -428,7 +429,12 @@ fitimage_emit_section_config() {
> fi
>
> dtb_path="${EXTERNAL_KERNEL_DEVICETREE}/${dtb_image_sect}"
> - compatible_line="compatible = \"$(fdtget "$dtb_path" / compatible |
sed 's/ /", "/g')\";"
> + if [ -e "$dtb_path" ]; then
> + compat=$(fdtget -t s "$dtb_path" / compatible | sed 's/ /",
"/g')
> + if [ -n "$compat" ]; then
> + compatible_line="compatible = \"$compat\";"
> + fi
> + fi
>
> dtb_image=$(echo $dtb_image | tr '/' '_')
> dtb_image_sect=$(echo "${dtb_image_sect}" | tr '/' '_')
> --
> 2.34.1
>
>
smime.p7s
Description: S/MIME cryptographic signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#196775): https://lists.openembedded.org/g/openembedded-core/message/196775 Mute This Topic: https://lists.openembedded.org/mt/104769468/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
