Commit e06a698a authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Masahiro Yamada
Browse files

scripts/make_fit: Drop fdt image entry compatible string 

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: 7a23b027 ("arm64: boot: Support Flat Image Tree")
Signed-off-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 3c562a70

scripts/make_fit.py

+1 −2
Original line number Diff line number Diff line
@@ -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)