According to the FIT image source file format document found in U-boot [1]
and the split-out FIT image specification [2], under "'/images' node" ->
"Conditionally mandatory property", the "compatible" property is described
as "compatible method for loading image", i.e., not the compatible string
embedded in the FDT or used for matching.
Drop the compatible string from the fdt image entry node.
While at it also fix up a typo in the document section of output_dtb.
[1] U-boot source "doc/usage/fit/source_file_format.rst", or on the website:
https://docs.u-boot.org/en/latest/usage/fit/source_file_format.html
[2] https://github.com/open-source-firmware/flat-image-tree/blob/main/source/chapter2-source-file-format.rst
Fixes: 7a23b027ec17 ("arm64: boot: Support Flat Image Tree")
Signed-off-by: Chen-Yu Tsai <[email protected]>
---
Changes since v1:
- Add clear reference to U-boot docs along with excerpt
- Send separately from "disable compression for DTBs" patch
scripts/make_fit.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/make_fit.py b/scripts/make_fit.py
index 3de90c5a094b..263147df80a4 100755
--- a/scripts/make_fit.py
+++ b/scripts/make_fit.py
@@ -190,7 +190,7 @@ def output_dtb(fsw, seq, fname, arch, compress):
Args:
fsw (libfdt.FdtSw): Object to use for writing
seq (int): Sequence number (1 for first)
- fmame (str): Filename containing the DTB
+ fname (str): Filename containing the DTB
arch: FIT architecture, e.g. 'arm64'
compress (str): Compressed algorithm, e.g. 'gzip'
@@ -211,7 +211,6 @@ def output_dtb(fsw, seq, fname, arch, compress):
fsw.property_string('type', 'flat_dt')
fsw.property_string('arch', arch)
fsw.property_string('compression', compress)
- fsw.property('compatible', bytes(compat))
with open(fname, 'rb') as inf:
compressed = compress_data(inf, compress)
--
2.45.1.288.g0e0cd299f1-goog
Hi,
On Tue, 28 May 2024 at 02:52, Chen-Yu Tsai <[email protected]> wrote:
>
> According to the FIT image source file format document found in U-boot [1]
> and the split-out FIT image specification [2], under "'/images' node" ->
> "Conditionally mandatory property", the "compatible" property is described
> as "compatible method for loading image", i.e., not the compatible string
> embedded in the FDT or used for matching.
>
> Drop the compatible string from the fdt image entry node.
>
> While at it also fix up a typo in the document section of output_dtb.
>
> [1] U-boot source "doc/usage/fit/source_file_format.rst", or on the website:
> https://docs.u-boot.org/en/latest/usage/fit/source_file_format.html
> [2] https://github.com/open-source-firmware/flat-image-tree/blob/main/source/chapter2-source-file-format.rst
>
> Fixes: 7a23b027ec17 ("arm64: boot: Support Flat Image Tree")
> Signed-off-by: Chen-Yu Tsai <[email protected]>
> ---
> Changes since v1:
> - Add clear reference to U-boot docs along with excerpt
> - Send separately from "disable compression for DTBs" patch
>
> scripts/make_fit.py | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Reviewed-by: Simon Glass <[email protected]>
On Tue, May 28, 2024 at 5:52 PM Chen-Yu Tsai <[email protected]> wrote:
>
> According to the FIT image source file format document found in U-boot [1]
> and the split-out FIT image specification [2], under "'/images' node" ->
> "Conditionally mandatory property", the "compatible" property is described
> as "compatible method for loading image", i.e., not the compatible string
> embedded in the FDT or used for matching.
>
> Drop the compatible string from the fdt image entry node.
>
> While at it also fix up a typo in the document section of output_dtb.
>
> [1] U-boot source "doc/usage/fit/source_file_format.rst", or on the website:
> https://docs.u-boot.org/en/latest/usage/fit/source_file_format.html
> [2] https://github.com/open-source-firmware/flat-image-tree/blob/main/source/chapter2-source-file-format.rst
>
> Fixes: 7a23b027ec17 ("arm64: boot: Support Flat Image Tree")
> Signed-off-by: Chen-Yu Tsai <[email protected]>
> ---
> Changes since v1:
> - Add clear reference to U-boot docs along with excerpt
> - Send separately from "disable compression for DTBs" patch
>
Applied to linux-kbuild.
Thanks!
--
Best Regards
Masahiro Yamada