[RFC PATCH 04/16] binman: test: Move FIT image test files to test/fit/

[Simon Glass]

Hi Quentin,

On Tue, 3 Mar 2026 at 05:41, Quentin Schulz <quentin.schulz at cherry.de> wrote:
>
> Hi Simon,
>
> On 2/27/26 12:47 AM, Simon Glass wrote:
> > From: Simon Glass <simon.glass at canonical.com>
> >
> > Move about 40 test files for FIT images (signing, external data,
> > split-elf, encryption, alignment, firmware loadables, templates) into
> > a fit/ subdirectory. Drop the numeric prefixes and the redundant fit_
> > filename prefix, and update all references.
> >
> > Rename the three signature.dts variants to have unique names:
> > signature.dts, signature_multi_key.dts and signature_no_nodes.dts.
> >
>
> What about aes256.bin, 340_rsa2048.key, dummy-rsa-engine.c,
> 340_dummy-rsa4096.crt, 340_openssl.conf, 340_softhsm2.conf, and dev.key?
>
> Can be done in a separate patch.
>
> > Signed-off-by: Simon Glass <simon.glass at canonical.com>
> > ---
> >
> >   tools/binman/ftest.py                         | 118 +++++++++---------
> >   .../test/{275_fit_align.dts => fit/align.dts} |   0
> >   .../{227_fit_bad_dir.dts => fit/bad_dir.dts}  |   2 +-
> >   .../bad_dir_config.dts}                       |   2 +-
> >   .../bad_oper.dts}                             |   0
> >   .../encrypt_data.dts}                         |   0
> >   .../encrypt_data_no_key.dts}                  |   0
> >   .../external.dts}                             |   0
> >   .../extract_replace.dts}                      |   0
> >   .../test/{170_fit_fdt.dts => fit/fdt.dts}     |   0
> >   .../fdt_compat.dts}                           |   0
> >   .../{333_fit_fdt_dir.dts => fit/fdt_dir.dts}  |   0
> >   .../fdt_list.dts}                             |   0
> >   .../fdt_missing_prop.dts}                     |   0
> >   .../fdt_name.dts}                             |   0
> >   .../fdt_oper.dts}                             |   0
> >   .../fdt_phase.dts}                            |   0
> >   .../firmware_loadables.dts}                   |   0
> >   .../binman/test/{161_fit.dts => fit/fit.dts}  |   0
> >   .../{219_fit_gennode.dts => fit/gennode.dts}  |   0
> >   .../image_subentry_alignment.dts}             |   0
> >   .../key_name_hint_dir_signature.dts}          |   0
> >   .../missing_blob.dts}                         |   0
> >   .../replace_sibling.dts}                      |   0
> >   .../test/{280_fit_sign.dts => fit/sign.dts}   |   0
> >   .../signature.dts}                            |   0
> >   .../signature_engine.dts}                     |   0
> >   .../signature_engine_encrypt.dts}             |   0
> >   .../signature_engine_pkcs11.dts}              |   0
> >   .../signature_engine_pkcs11_object.dts}       |   0
> >   .../signature_multi_key.dts}                  |   0
> >   .../signature_no_nodes.dts}                   |   0
> >   .../split_elf.dts}                            |   0
> >   .../subentry_bintool.dts}                     |   0
> >   .../subentry_hash.dts}                        |   0
> >   .../tee_os_opt.dts}                           |   0
> >   .../tee_os_opt_bad.dts}                       |   0
> >   .../template.dts}                             |   0
> >   38 files changed, 61 insertions(+), 61 deletions(-)
> >   rename tools/binman/test/{275_fit_align.dts => fit/align.dts} (100%)
> >   rename tools/binman/test/{227_fit_bad_dir.dts => fit/bad_dir.dts} (71%)
> >   rename tools/binman/test/{228_fit_bad_dir_config.dts => fit/bad_dir_config.dts} (71%)
> >   rename tools/binman/test/{224_fit_bad_oper.dts => fit/bad_oper.dts} (100%)
> >   rename tools/binman/test/{343_fit_encrypt_data.dts => fit/encrypt_data.dts} (100%)
> >   rename tools/binman/test/{344_fit_encrypt_data_no_key.dts => fit/encrypt_data_no_key.dts} (100%)
> >   rename tools/binman/test/{162_fit_external.dts => fit/external.dts} (100%)
> >   rename tools/binman/test/{240_fit_extract_replace.dts => fit/extract_replace.dts} (100%)
> >   rename tools/binman/test/{170_fit_fdt.dts => fit/fdt.dts} (100%)
> >   rename tools/binman/test/{334_fit_fdt_compat.dts => fit/fdt_compat.dts} (100%)
> >   rename tools/binman/test/{333_fit_fdt_dir.dts => fit/fdt_dir.dts} (100%)
> >   rename tools/binman/test/{284_fit_fdt_list.dts => fit/fdt_list.dts} (100%)
> >   rename tools/binman/test/{171_fit_fdt_missing_prop.dts => fit/fdt_missing_prop.dts} (100%)
> >   rename tools/binman/test/{345_fit_fdt_name.dts => fit/fdt_name.dts} (100%)
> >   rename tools/binman/test/{223_fit_fdt_oper.dts => fit/fdt_oper.dts} (100%)
> >   rename tools/binman/test/{335_fit_fdt_phase.dts => fit/fdt_phase.dts} (100%)
> >   rename tools/binman/test/{276_fit_firmware_loadables.dts => fit/firmware_loadables.dts} (100%)
> >   rename tools/binman/test/{161_fit.dts => fit/fit.dts} (100%)
> >   rename tools/binman/test/{219_fit_gennode.dts => fit/gennode.dts} (100%)
> >   rename tools/binman/test/{167_fit_image_subentry_alignment.dts => fit/image_subentry_alignment.dts} (100%)
> >   rename tools/binman/test/{355_key_name_hint_dir_fit_signature.dts => fit/key_name_hint_dir_signature.dts} (100%)
>
> This file doesn't exist. What is this series based on? I'm assuming
> https://lore.kernel.org/u-boot/20260225225040.2568118-1-sjg@chromium.org/
> but can you please specify series dependencies in the cover-letter so we
> don't have to guess. I'm also thinking the parent dependency have two
> patches we wouldn't need with this series here (rename and drop the
> number, patch 1 and 2 of the series).

Yes that's right. The commit hash is in the cover letter but the
branch name doesn't help very much! I need to update patman to include
the patch link as well. I could rework that series to drop the
renames, but the point of that series is really to fix the test
coverage.

Perhaps I should just combine the two series into one?

Regards,
Simon