]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "fit: print conf node compatibles + use property string constants"
authorTom Rini <trini@konsulko.com>
Tue, 16 Dec 2025 17:40:54 +0000 (11:40 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 16 Dec 2025 17:40:54 +0000 (11:40 -0600)
Quentin Schulz <foss+uboot@0leil.net> says:

This does a bit of "cleanup" by reusing constants for some FIT
properties instead of having the same string in multiple places.

Additionally, this adds a new constant for the compatible property in
FIT configuration nodes[1] which is useful for FIT images with multiple
FIT configuration nodes to support multiple devices in the same blob.
U-Boot will try to figure out which node to select based on that
compatible[2].

However, if this property is missing (and the first blob in the fdt
property of the configuration node is uncompressed), the compatible from
the root node of the associated kernel FDT will be used for the
autoselection mechanism. For now, I only print the property if it
exists, but maybe it'd make sense to expose the fallback one if it's
missing. I guess we can implement that later on if desired.

[1] https://fitspec.osfw.foundation/#optional-properties compatible paragraph
[2] https://fitspec.osfw.foundation/#select-a-configuration-to-boot

Link: https://lore.kernel.org/r/20251203-fit-compat-v2-0-0fea56f23809@cherry.de
1  2 
boot/image-fit.c
include/image.h

Simple merge
diff --cc include/image.h
index d543c6cf254ced0a1fd50a0cbcc17724b3a99c19,8dcf0cea25f4891c0973035fd9a24abd996ce3c3..8841dea06c985dc7a71ee31514c3db58b132e9e7
@@@ -1105,7 -1105,7 +1105,8 @@@ int booti_setup(ulong image, ulong *rel
  #define FIT_SCRIPT_PROP               "script"
  #define FIT_PHASE_PROP                "phase"
  #define FIT_TFA_BL31_PROP     "tfa-bl31"
 +#define FIT_TEE_PROP          "tee"
+ #define FIT_COMPAT_PROP               "compatible"
  
  #define FIT_MAX_HASH_LEN      HASH_MAX_DIGEST_SIZE