[PATCH 11/15] binman: Rename directory to binmanu

The name 'binman' is already taken in PyPi so use 'binmanu' as the name of the package. Rename the source directory accordingly.

Add a symlink to avoid any major disruption for people used to invoking binman from within the source tree.

Signed-off-by: Simon Glass sjg@chromium.org ---

scripts/event_dump.py | 2 +- tools/binman | 1 + tools/{binman => binmanu}/.gitignore | 0 tools/{binman => binmanu}/README.rst | 0 tools/{binman => binmanu}/__init__.py | 0 tools/{binman => binmanu}/binman | 0 tools/{binman => binmanu}/binman.rst | 0 tools/{binman => binmanu}/bintool.py | 4 +-- tools/{binman => binmanu}/bintool_test.py | 6 ++-- tools/{binman => binmanu}/bintools.rst | 0 tools/{binman => binmanu}/btool/_testing.py | 2 +- tools/{binman => binmanu}/btool/btool_gzip.py | 2 +- tools/{binman => binmanu}/btool/bzip2.py | 2 +- tools/{binman => binmanu}/btool/cbfstool.py | 2 +- tools/{binman => binmanu}/btool/fiptool.py | 2 +- tools/{binman => binmanu}/btool/futility.py | 2 +- tools/{binman => binmanu}/btool/ifwitool.py | 2 +- tools/{binman => binmanu}/btool/lz4.py | 2 +- tools/{binman => binmanu}/btool/lzma_alone.py | 2 +- tools/{binman => binmanu}/btool/lzop.py | 2 +- tools/{binman => binmanu}/btool/mkimage.py | 2 +- tools/{binman => binmanu}/btool/xz.py | 2 +- tools/{binman => binmanu}/btool/zstd.py | 2 +- tools/{binman => binmanu}/cbfs_util.py | 4 +-- tools/{binman => binmanu}/cbfs_util_test.py | 8 ++--- tools/{binman => binmanu}/cmdline.py | 2 +- tools/{binman => binmanu}/control.py | 16 ++++----- tools/{binman => binmanu}/elf.py | 2 +- tools/{binman => binmanu}/elf_test.py | 2 +- tools/{binman => binmanu}/entries.rst | 0 tools/{binman => binmanu}/entry.py | 8 ++--- tools/{binman => binmanu}/entry_test.py | 8 ++--- tools/{binman => binmanu}/etype/_testing.py | 2 +- tools/{binman => binmanu}/etype/atf_bl31.py | 2 +- tools/{binman => binmanu}/etype/atf_fip.py | 8 ++--- tools/{binman => binmanu}/etype/blob.py | 4 +-- tools/{binman => binmanu}/etype/blob_dtb.py | 6 ++-- tools/{binman => binmanu}/etype/blob_ext.py | 2 +- .../etype/blob_ext_list.py | 2 +- .../etype/blob_named_by_arg.py | 4 +-- tools/{binman => binmanu}/etype/blob_phase.py | 4 +-- tools/{binman => binmanu}/etype/cbfs.py | 8 ++--- tools/{binman => binmanu}/etype/collection.py | 2 +- tools/{binman => binmanu}/etype/cros_ec_rw.py | 2 +- tools/{binman => binmanu}/etype/fdtmap.py | 4 +-- tools/{binman => binmanu}/etype/files.py | 4 +-- tools/{binman => binmanu}/etype/fill.py | 2 +- tools/{binman => binmanu}/etype/fit.py | 6 ++-- tools/{binman => binmanu}/etype/fmap.py | 4 +-- tools/{binman => binmanu}/etype/gbb.py | 2 +- .../{binman => binmanu}/etype/image_header.py | 2 +- tools/{binman => binmanu}/etype/intel_cmc.py | 2 +- .../etype/intel_descriptor.py | 4 +-- tools/{binman => binmanu}/etype/intel_fit.py | 2 +- .../etype/intel_fit_ptr.py | 2 +- tools/{binman => binmanu}/etype/intel_fsp.py | 2 +- .../{binman => binmanu}/etype/intel_fsp_m.py | 2 +- .../{binman => binmanu}/etype/intel_fsp_s.py | 2 +- .../{binman => binmanu}/etype/intel_fsp_t.py | 2 +- tools/{binman => binmanu}/etype/intel_ifwi.py | 4 +-- tools/{binman => binmanu}/etype/intel_me.py | 2 +- tools/{binman => binmanu}/etype/intel_mrc.py | 2 +- .../etype/intel_refcode.py | 2 +- tools/{binman => binmanu}/etype/intel_vbt.py | 2 +- tools/{binman => binmanu}/etype/intel_vga.py | 2 +- tools/{binman => binmanu}/etype/mkimage.py | 2 +- tools/{binman => binmanu}/etype/null.py | 2 +- tools/{binman => binmanu}/etype/opensbi.py | 2 +- .../etype/powerpc_mpc85xx_bootpg_resetvec.py | 2 +- tools/{binman => binmanu}/etype/pre_load.py | 6 ++-- tools/{binman => binmanu}/etype/scp.py | 2 +- tools/{binman => binmanu}/etype/section.py | 4 +-- tools/{binman => binmanu}/etype/tee_os.py | 4 +-- tools/{binman => binmanu}/etype/text.py | 2 +- tools/{binman => binmanu}/etype/u_boot.py | 4 +-- tools/{binman => binmanu}/etype/u_boot_dtb.py | 4 +-- .../etype/u_boot_dtb_with_ucode.py | 6 ++-- tools/{binman => binmanu}/etype/u_boot_elf.py | 4 +-- tools/{binman => binmanu}/etype/u_boot_env.py | 2 +- .../etype/u_boot_expanded.py | 2 +- tools/{binman => binmanu}/etype/u_boot_img.py | 4 +-- .../{binman => binmanu}/etype/u_boot_nodtb.py | 4 +-- tools/{binman => binmanu}/etype/u_boot_spl.py | 4 +-- .../etype/u_boot_spl_bss_pad.py | 6 ++-- .../etype/u_boot_spl_dtb.py | 4 +-- .../etype/u_boot_spl_elf.py | 4 +-- .../etype/u_boot_spl_expanded.py | 4 +-- .../etype/u_boot_spl_nodtb.py | 4 +-- .../etype/u_boot_spl_with_ucode_ptr.py | 2 +- tools/{binman => binmanu}/etype/u_boot_tpl.py | 4 +-- .../etype/u_boot_tpl_bss_pad.py | 6 ++-- .../etype/u_boot_tpl_dtb.py | 4 +-- .../etype/u_boot_tpl_dtb_with_ucode.py | 2 +- .../etype/u_boot_tpl_elf.py | 4 +-- .../etype/u_boot_tpl_expanded.py | 4 +-- .../etype/u_boot_tpl_nodtb.py | 4 +-- .../etype/u_boot_tpl_with_ucode_ptr.py | 6 ++-- .../{binman => binmanu}/etype/u_boot_ucode.py | 4 +-- tools/{binman => binmanu}/etype/u_boot_vpl.py | 4 +-- .../etype/u_boot_vpl_bss_pad.py | 6 ++-- .../etype/u_boot_vpl_dtb.py | 4 +-- .../etype/u_boot_vpl_elf.py | 4 +-- .../etype/u_boot_vpl_expanded.py | 4 +-- .../etype/u_boot_vpl_nodtb.py | 4 +-- .../etype/u_boot_with_ucode_ptr.py | 6 ++-- tools/{binman => binmanu}/etype/vblock.py | 4 +-- .../{binman => binmanu}/etype/x86_reset16.py | 4 +-- .../etype/x86_reset16_spl.py | 4 +-- .../etype/x86_reset16_tpl.py | 4 +-- .../{binman => binmanu}/etype/x86_start16.py | 4 +-- .../etype/x86_start16_spl.py | 4 +-- .../etype/x86_start16_tpl.py | 4 +-- tools/{binman => binmanu}/fdt_test.py | 0 tools/{binman => binmanu}/fip_util.py | 0 tools/{binman => binmanu}/fip_util_test.py | 4 +-- tools/{binman => binmanu}/fmap_util.py | 0 tools/{binman => binmanu}/ftest.py | 32 +++++++++--------- tools/{binman => binmanu}/image.py | 8 ++--- tools/{binman => binmanu}/image_test.py | 2 +- tools/{binman => binmanu}/index.rst | 0 tools/{binman => binmanu}/main.py | 30 ++++++++-------- tools/{binman => binmanu}/missing-blob-help | 0 tools/{binman => binmanu}/setup.py | 0 tools/{binman => binmanu}/state.py | 0 .../{binman => binmanu}/test/001_invalid.dts | 0 .../test/002_missing_node.dts | 0 tools/{binman => binmanu}/test/003_empty.dts | 0 .../test/004_invalid_entry.dts | 0 tools/{binman => binmanu}/test/005_simple.dts | 0 .../test/006_dual_image.dts | 0 .../test/007_bad_align.dts | 0 tools/{binman => binmanu}/test/008_pack.dts | 0 .../test/009_pack_extra.dts | 0 .../test/010_pack_align_power2.dts | 0 .../test/011_pack_align_size_power2.dts | 0 .../test/012_pack_inv_align.dts | 0 .../test/013_pack_inv_size_align.dts | 0 .../test/014_pack_overlap.dts | 0 .../test/015_pack_overflow.dts | 0 .../test/016_pack_image_overflow.dts | 0 .../test/017_pack_image_size.dts | 0 .../test/018_pack_image_align.dts | 0 .../test/019_pack_inv_image_align.dts | 0 .../test/020_pack_inv_image_align_power2.dts | 0 .../test/021_image_pad.dts | 0 .../test/022_image_name.dts | 0 tools/{binman => binmanu}/test/023_blob.dts | 0 tools/{binman => binmanu}/test/024_sorted.dts | 0 .../test/025_pack_zero_size.dts | 0 .../test/026_pack_u_boot_dtb.dts | 0 .../test/027_pack_4gb_no_size.dts | 0 .../test/028_pack_4gb_outside.dts | 0 .../{binman => binmanu}/test/029_x86_rom.dts | 0 .../test/030_x86_rom_me_no_desc.dts | 0 .../test/031_x86_rom_me.dts | 0 .../test/032_intel_vga.dts | 0 .../test/033_x86_start16.dts | 0 .../test/034_x86_ucode.dts | 0 .../test/035_x86_single_ucode.dts | 0 .../test/036_u_boot_img.dts | 0 .../test/037_x86_no_ucode.dts | 0 .../test/038_x86_ucode_missing_node.dts | 0 .../test/039_x86_ucode_missing_node2.dts | 0 .../test/040_x86_ucode_not_in_image.dts | 0 .../test/041_unknown_pos_size.dts | 0 .../test/042_intel_fsp.dts | 0 .../test/043_intel_cmc.dts | 0 .../test/044_x86_optional_ucode.dts | 0 .../test/045_prop_test.dts | 0 .../test/046_intel_vbt.dts | 0 .../test/047_spl_bss_pad.dts | 0 .../test/048_x86_start16_spl.dts | 0 .../test/049_x86_ucode_spl.dts | 0 .../test/050_intel_mrc.dts | 0 .../test/051_u_boot_spl_dtb.dts | 0 .../test/052_u_boot_spl_nodtb.dts | 0 .../{binman => binmanu}/test/053_symbols.dts | 0 .../test/054_unit_address.dts | 0 .../{binman => binmanu}/test/055_sections.dts | 0 .../test/056_name_prefix.dts | 0 .../test/057_unknown_contents.dts | 0 .../test/058_x86_ucode_spl_needs_retry.dts | 0 .../test/059_change_size.dts | 0 .../test/060_fdt_update.dts | 0 .../test/061_fdt_update_bad.dts | 0 .../test/062_entry_args.dts | 0 .../test/063_entry_args_missing.dts | 0 .../test/064_entry_args_required.dts | 0 .../test/065_entry_args_unknown_datatype.dts | 0 tools/{binman => binmanu}/test/066_text.dts | 0 tools/{binman => binmanu}/test/067_fmap.dts | 0 .../test/068_blob_named_by_arg.dts | 0 tools/{binman => binmanu}/test/069_fill.dts | 0 .../test/070_fill_no_size.dts | 0 tools/{binman => binmanu}/test/071_gbb.dts | 0 .../test/072_gbb_too_small.dts | 0 .../test/073_gbb_no_size.dts | 0 tools/{binman => binmanu}/test/074_vblock.dts | 0 .../test/075_vblock_no_content.dts | 0 .../test/076_vblock_bad_phandle.dts | 0 .../test/077_vblock_bad_entry.dts | 0 .../test/078_u_boot_tpl.dts | 0 .../{binman => binmanu}/test/079_uses_pos.dts | 0 .../test/080_fill_empty.dts | 0 .../test/081_x86_start16_tpl.dts | 0 .../test/082_fdt_update_all.dts | 0 .../{binman => binmanu}/test/083_compress.dts | 0 tools/{binman => binmanu}/test/084_files.dts | 0 .../test/085_files_compress.dts | 0 .../test/086_files_none.dts | 0 .../test/087_files_no_pattern.dts | 0 .../test/088_extend_size.dts | 0 .../test/089_extend_size_bad.dts | 0 tools/{binman => binmanu}/test/090_hash.dts | 0 .../test/091_hash_no_algo.dts | 0 .../test/092_hash_bad_algo.dts | 0 .../test/093_x86_tpl_ucode.dts | 0 .../{binman => binmanu}/test/094_fmap_x86.dts | 0 .../test/095_fmap_x86_section.dts | 0 tools/{binman => binmanu}/test/096_elf.dts | 0 .../test/097_elf_strip.dts | 0 .../098_4gb_and_skip_at_start_together.dts | 0 .../test/099_hash_section.dts | 0 .../test/100_intel_refcode.dts | 0 .../test/101_sections_offset.dts | 0 .../{binman => binmanu}/test/102_cbfs_raw.dts | 0 .../test/103_cbfs_raw_ppc.dts | 0 .../test/104_cbfs_stage.dts | 0 .../test/105_cbfs_raw_compress.dts | 0 .../test/106_cbfs_bad_arch.dts | 0 .../test/107_cbfs_no_size.dts | 0 .../test/108_cbfs_no_contents.dts | 0 .../test/109_cbfs_bad_compress.dts | 0 .../test/110_cbfs_name.dts | 0 .../test/111_x86_rom_ifwi.dts | 0 .../test/112_x86_rom_ifwi_nodesc.dts | 0 .../test/113_x86_rom_ifwi_nodata.dts | 0 .../test/114_cbfs_offset.dts | 0 tools/{binman => binmanu}/test/115_fdtmap.dts | 0 .../test/116_fdtmap_hdr.dts | 0 .../test/117_fdtmap_hdr_start.dts | 0 .../test/118_fdtmap_hdr_pos.dts | 0 .../test/119_fdtmap_hdr_missing.dts | 0 .../test/120_hdr_no_location.dts | 0 .../test/121_entry_extend.dts | 0 .../test/122_entry_extend_twice.dts | 0 .../test/123_entry_extend_section.dts | 0 .../test/124_compress_dtb.dts | 0 .../test/125_cbfs_update.dts | 0 .../test/126_cbfs_bad_type.dts | 0 tools/{binman => binmanu}/test/127_list.dts | 0 .../test/128_decode_image.dts | 0 .../test/129_decode_image_nohdr.dts | 0 .../test/130_list_fdtmap.dts | 0 .../test/131_pack_align_section.dts | 0 .../{binman => binmanu}/test/132_replace.dts | 0 .../test/133_replace_multi.dts | 0 .../test/134_fdt_update_all_repack.dts | 0 .../test/135_fdtmap_hdr_middle.dts | 0 .../test/136_fdtmap_hdr_startbad.dts | 0 .../test/137_fdtmap_hdr_endbad.dts | 0 .../test/138_fdtmap_hdr_nosize.dts | 0 .../test/139_replace_repack.dts | 0 .../test/140_entry_shrink.dts | 0 .../test/141_descriptor_offset.dts | 0 .../test/142_replace_cbfs.dts | 0 .../test/143_replace_all.dts | 0 .../test/144_x86_reset16.dts | 0 .../test/145_x86_reset16_spl.dts | 0 .../test/146_x86_reset16_tpl.dts | 0 .../test/147_intel_fit.dts | 0 .../test/148_intel_fit_missing.dts | 0 .../test/149_symbols_tpl.dts | 0 .../150_powerpc_mpc85xx_bootpg_resetvec.dts | 0 .../test/151_x86_rom_ifwi_section.dts | 0 .../test/152_intel_fsp_m.dts | 0 .../test/153_intel_fsp_s.dts | 0 .../test/154_intel_fsp_t.dts | 0 .../test/155_symbols_tpl_x86.dts | 0 .../{binman => binmanu}/test/156_mkimage.dts | 0 .../{binman => binmanu}/test/157_blob_ext.dts | 0 .../test/158_blob_ext_missing.dts | 0 .../test/159_blob_ext_missing_sect.dts | 0 .../test/160_pack_overlap_zero.dts | 0 tools/{binman => binmanu}/test/161_fit.dts | 0 .../test/162_fit_external.dts | 0 .../test/163_x86_rom_me_empty.dts | 0 .../test/164_x86_rom_me_missing.dts | 0 .../165_section_ignore_hash_signature.dts | 0 .../test/166_pad_in_sections.dts | 0 .../test/167_fit_image_subentry_alignment.dts | 0 .../test/168_fit_missing_blob.dts | 0 .../{binman => binmanu}/test/169_atf_bl31.dts | 0 .../{binman => binmanu}/test/170_fit_fdt.dts | 0 .../test/171_fit_fdt_missing_prop.dts | 0 tools/{binman => binmanu}/test/172_scp.dts | 0 .../test/173_missing_blob.dts | 0 tools/{binman => binmanu}/test/174_env.dts | 0 .../test/175_env_no_size.dts | 0 .../test/176_env_too_small.dts | 0 .../test/177_skip_at_start.dts | 0 .../test/178_skip_at_start_pad.dts | 0 .../test/179_skip_at_start_section_pad.dts | 0 .../test/180_section_pad.dts | 0 .../test/181_section_align.dts | 0 .../test/182_compress_image.dts | 0 .../test/183_compress_image_less.dts | 0 .../test/184_compress_section_size.dts | 0 .../test/185_compress_section.dts | 0 .../test/186_compress_extra.dts | 0 .../test/187_symbols_sub.dts | 0 .../test/188_image_entryarg.dts | 0 .../test/189_vblock_content.dts | 0 .../test/190_files_align.dts | 0 .../test/191_read_image_skip.dts | 0 .../test/192_u_boot_tpl_nodtb.dts | 0 .../test/193_tpl_bss_pad.dts | 0 .../{binman => binmanu}/test/194_fdt_incl.dts | 0 .../test/195_fdt_incl_tpl.dts | 0 .../test/196_symbols_nodtb.dts | 0 .../test/197_symbols_expand.dts | 0 .../test/198_collection.dts | 0 .../test/199_collection_section.dts | 0 .../test/200_align_default.dts | 0 .../{binman => binmanu}/test/201_opensbi.dts | 0 .../test/202_section_timeout.dts | 0 tools/{binman => binmanu}/test/203_fip.dts | 0 .../test/204_fip_other.dts | 0 .../test/205_fip_no_type.dts | 0 .../{binman => binmanu}/test/206_fip_uuid.dts | 0 tools/{binman => binmanu}/test/207_fip_ls.dts | 0 .../test/208_fip_replace.dts | 0 .../test/209_fip_missing.dts | 0 .../{binman => binmanu}/test/210_fip_size.dts | 0 .../test/211_fip_bad_align.dts | 0 .../test/212_fip_collection.dts | 0 .../test/213_fdtmap_alt_format.dts | 0 .../test/214_no_alt_format.dts | 0 .../test/215_blob_ext_list.dts | 0 .../test/216_blob_ext_list_missing.dts | 0 .../test/217_fake_blob.dts | 0 .../test/218_blob_ext_list_fake.dts | 0 .../test/219_fit_gennode.dts | 0 .../test/220_fit_subentry_bintool.dts | 0 .../test/221_fit_subentry_hash.dts | 0 tools/{binman => binmanu}/test/222_tee_os.dts | 0 .../test/223_fit_fdt_oper.dts | 0 .../test/224_fit_bad_oper.dts | 0 .../test/225_expand_size_bad.dts | 0 .../test/226_fit_split_elf.dts | 0 .../test/227_fit_bad_dir.dts | 0 .../test/228_fit_bad_dir_config.dts | 0 .../test/229_mkimage_missing.dts | 0 tools/{binman => binmanu}/test/230_dev.key | 0 .../{binman => binmanu}/test/230_pre_load.dts | 2 +- .../test/231_pre_load_pkcs.dts | 2 +- .../test/232_pre_load_pss.dts | 2 +- .../test/233_pre_load_invalid_padding.dts | 2 +- .../test/234_pre_load_invalid_sha.dts | 2 +- .../test/235_pre_load_invalid_algo.dts | 2 +- .../test/236_pre_load_invalid_key.dts | 2 +- .../test/237_unique_names.dts | 0 .../test/238_unique_names_multi.dts | 0 .../test/239_replace_with_bintool.dts | 0 .../test/240_fit_extract_replace.dts | 0 .../test/241_replace_section_simple.dts | 0 .../test/242_mkimage_name.dts | 0 .../test/243_mkimage_image.dts | 0 .../test/244_mkimage_image_no_content.dts | 0 .../test/245_mkimage_image_bad.dts | 0 .../test/246_collection_other.dts | 0 .../test/247_mkimage_coll.dts | 0 .../test/248_compress_dtb_prepend_invalid.dts | 0 .../test/249_compress_dtb_prepend_length.dts | 0 .../test/250_compress_dtb_invalid.dts | 0 .../test/251_compress_dtb_zstd.dts | 0 .../test/252_mkimage_mult_data.dts | 0 .../test/253_mkimage_mult_no_content.dts | 0 .../test/254_mkimage_filename.dts | 0 .../test/255_u_boot_vpl.dts | 0 .../test/256_u_boot_vpl_nodtb.dts | 0 .../test/257_fdt_incl_vpl.dts | 0 .../test/258_vpl_bss_pad.dts | 0 .../{binman => binmanu}/test/259_symlink.dts | 0 .../test/260_symbols_elf.dts | 0 .../test/261_section_fname.dts | 0 tools/{binman => binmanu}/test/262_absent.dts | 0 .../test/263_tee_os_opt.dts | 0 .../test/264_tee_os_opt_fit.dts | 0 .../test/265_tee_os_opt_fit_bad.dts | 0 .../test/266_blob_ext_opt.dts | 0 .../test/267_section_inner.dts | 0 tools/{binman => binmanu}/test/268_null.dts | 0 .../{binman => binmanu}/test/269_overlap.dts | 0 .../test/270_overlap_null.dts | 0 .../test/271_overlap_bad.dts | 0 .../test/272_overlap_no_size.dts | 0 .../test/273_blob_symbol.dts | 0 .../test/274_offset_from_elf.dts | 0 .../test/275_fit_align.dts | 0 .../test/276_fit_firmware_loadables.dts | 0 tools/{binman => binmanu}/test/Makefile | 0 tools/{binman => binmanu}/test/blob_syms.c | 0 tools/{binman => binmanu}/test/blob_syms.lds | 0 tools/{binman => binmanu}/test/bss_data.c | 0 tools/{binman => binmanu}/test/bss_data.lds | 0 tools/{binman => binmanu}/test/descriptor.bin | Bin tools/{binman => binmanu}/test/elf_sections.c | 0 .../{binman => binmanu}/test/elf_sections.lds | 0 tools/{binman => binmanu}/test/embed_data.c | 0 tools/{binman => binmanu}/test/embed_data.lds | 0 tools/{binman => binmanu}/test/files/1.dat | 0 tools/{binman => binmanu}/test/files/2.dat | 0 .../test/files/ignored_dir.dat/ignore | 0 .../test/files/not-this-one | 0 .../{binman => binmanu}/test/fitimage.bin.gz | Bin .../test/generated/autoconf.h | 0 tools/{binman => binmanu}/test/ifwi.bin.gz | Bin .../test/u_boot_binman_embed.c | 0 .../test/u_boot_binman_embed.lds | 0 .../test/u_boot_binman_embed_sm.c | 0 .../test/u_boot_binman_syms.c | 0 .../test/u_boot_binman_syms.lds | 0 .../test/u_boot_binman_syms_bad.c | 0 .../test/u_boot_binman_syms_bad.lds | 0 .../test/u_boot_binman_syms_size.c | 0 .../test/u_boot_binman_syms_x86.c | 0 .../test/u_boot_binman_syms_x86.lds | 0 .../test/u_boot_no_ucode_ptr.c | 0 .../test/u_boot_ucode_ptr.c | 0 .../test/u_boot_ucode_ptr.lds | 0 tools/u_boot_pylib/tools.py | 2 +- 432 files changed, 233 insertions(+), 232 deletions(-) create mode 120000 tools/binman rename tools/{binman => binmanu}/.gitignore (100%) rename tools/{binman => binmanu}/README.rst (100%) rename tools/{binman => binmanu}/__init__.py (100%) rename tools/{binman => binmanu}/binman (100%) rename tools/{binman => binmanu}/binman.rst (100%) rename tools/{binman => binmanu}/bintool.py (99%) rename tools/{binman => binmanu}/bintool_test.py (99%) rename tools/{binman => binmanu}/bintools.rst (100%) rename tools/{binman => binmanu}/btool/_testing.py (97%) rename tools/{binman => binmanu}/btool/btool_gzip.py (96%) rename tools/{binman => binmanu}/btool/bzip2.py (96%) rename tools/{binman => binmanu}/btool/cbfstool.py (99%) rename tools/{binman => binmanu}/btool/fiptool.py (99%) rename tools/{binman => binmanu}/btool/futility.py (99%) rename tools/{binman => binmanu}/btool/ifwitool.py (99%) rename tools/{binman => binmanu}/btool/lz4.py (99%) rename tools/{binman => binmanu}/btool/lzma_alone.py (99%) rename tools/{binman => binmanu}/btool/lzop.py (96%) rename tools/{binman => binmanu}/btool/mkimage.py (98%) rename tools/{binman => binmanu}/btool/xz.py (96%) rename tools/{binman => binmanu}/btool/zstd.py (96%) rename tools/{binman => binmanu}/cbfs_util.py (99%) rename tools/{binman => binmanu}/cbfs_util_test.py (99%) rename tools/{binman => binmanu}/cmdline.py (99%) rename tools/{binman => binmanu}/control.py (99%) rename tools/{binman => binmanu}/elf.py (99%) rename tools/{binman => binmanu}/elf_test.py (99%) rename tools/{binman => binmanu}/entries.rst (100%) rename tools/{binman => binmanu}/entry.py (99%) rename tools/{binman => binmanu}/entry_test.py (97%) rename tools/{binman => binmanu}/etype/_testing.py (99%) rename tools/{binman => binmanu}/etype/atf_bl31.py (92%) rename tools/{binman => binmanu}/etype/atf_fip.py (98%) rename tools/{binman => binmanu}/etype/blob.py (98%) rename tools/{binman => binmanu}/etype/blob_dtb.py (96%) rename tools/{binman => binmanu}/etype/blob_ext.py (96%) rename tools/{binman => binmanu}/etype/blob_ext_list.py (97%) rename tools/{binman => binmanu}/etype/blob_named_by_arg.py (94%) rename tools/{binman => binmanu}/etype/blob_phase.py (95%) rename tools/{binman => binmanu}/etype/cbfs.py (98%) rename tools/{binman => binmanu}/etype/collection.py (98%) rename tools/{binman => binmanu}/etype/cros_ec_rw.py (91%) rename tools/{binman => binmanu}/etype/fdtmap.py (98%) rename tools/{binman => binmanu}/etype/files.py (96%) rename tools/{binman => binmanu}/etype/fill.py (97%) rename tools/{binman => binmanu}/etype/fit.py (99%) rename tools/{binman => binmanu}/etype/fmap.py (98%) rename tools/{binman => binmanu}/etype/gbb.py (98%) rename tools/{binman => binmanu}/etype/image_header.py (99%) rename tools/{binman => binmanu}/etype/intel_cmc.py (92%) rename tools/{binman => binmanu}/etype/intel_descriptor.py (97%) rename tools/{binman => binmanu}/etype/intel_fit.py (94%) rename tools/{binman => binmanu}/etype/intel_fit_ptr.py (96%) rename tools/{binman => binmanu}/etype/intel_fsp.py (94%) rename tools/{binman => binmanu}/etype/intel_fsp_m.py (94%) rename tools/{binman => binmanu}/etype/intel_fsp_s.py (94%) rename tools/{binman => binmanu}/etype/intel_fsp_t.py (94%) rename tools/{binman => binmanu}/etype/intel_ifwi.py (98%) rename tools/{binman => binmanu}/etype/intel_me.py (95%) rename tools/{binman => binmanu}/etype/intel_mrc.py (93%) rename tools/{binman => binmanu}/etype/intel_refcode.py (93%) rename tools/{binman => binmanu}/etype/intel_vbt.py (92%) rename tools/{binman => binmanu}/etype/intel_vga.py (93%) rename tools/{binman => binmanu}/etype/mkimage.py (99%) rename tools/{binman => binmanu}/etype/null.py (95%) rename tools/{binman => binmanu}/etype/opensbi.py (91%) rename tools/{binman => binmanu}/etype/powerpc_mpc85xx_bootpg_resetvec.py (94%) rename tools/{binman => binmanu}/etype/pre_load.py (97%) rename tools/{binman => binmanu}/etype/scp.py (89%) rename tools/{binman => binmanu}/etype/section.py (99%) rename tools/{binman => binmanu}/etype/tee_os.py (97%) rename tools/{binman => binmanu}/etype/text.py (98%) rename tools/{binman => binmanu}/etype/u_boot.py (92%) rename tools/{binman => binmanu}/etype/u_boot_dtb.py (91%) rename tools/{binman => binmanu}/etype/u_boot_dtb_with_ucode.py (96%) rename tools/{binman => binmanu}/etype/u_boot_elf.py (93%) rename tools/{binman => binmanu}/etype/u_boot_env.py (96%) rename tools/{binman => binmanu}/etype/u_boot_expanded.py (93%) rename tools/{binman => binmanu}/etype/u_boot_img.py (90%) rename tools/{binman => binmanu}/etype/u_boot_nodtb.py (92%) rename tools/{binman => binmanu}/etype/u_boot_spl.py (95%) rename tools/{binman => binmanu}/etype/u_boot_spl_bss_pad.py (94%) rename tools/{binman => binmanu}/etype/u_boot_spl_dtb.py (90%) rename tools/{binman => binmanu}/etype/u_boot_spl_elf.py (90%) rename tools/{binman => binmanu}/etype/u_boot_spl_expanded.py (95%) rename tools/{binman => binmanu}/etype/u_boot_spl_nodtb.py (94%) rename tools/{binman => binmanu}/etype/u_boot_spl_with_ucode_ptr.py (90%) rename tools/{binman => binmanu}/etype/u_boot_tpl.py (95%) rename tools/{binman => binmanu}/etype/u_boot_tpl_bss_pad.py (94%) rename tools/{binman => binmanu}/etype/u_boot_tpl_dtb.py (90%) rename tools/{binman => binmanu}/etype/u_boot_tpl_dtb_with_ucode.py (90%) rename tools/{binman => binmanu}/etype/u_boot_tpl_elf.py (90%) rename tools/{binman => binmanu}/etype/u_boot_tpl_expanded.py (95%) rename tools/{binman => binmanu}/etype/u_boot_tpl_nodtb.py (94%) rename tools/{binman => binmanu}/etype/u_boot_tpl_with_ucode_ptr.py (82%) rename tools/{binman => binmanu}/etype/u_boot_ucode.py (98%) rename tools/{binman => binmanu}/etype/u_boot_vpl.py (94%) rename tools/{binman => binmanu}/etype/u_boot_vpl_bss_pad.py (94%) rename tools/{binman => binmanu}/etype/u_boot_vpl_dtb.py (90%) rename tools/{binman => binmanu}/etype/u_boot_vpl_elf.py (90%) rename tools/{binman => binmanu}/etype/u_boot_vpl_expanded.py (95%) rename tools/{binman => binmanu}/etype/u_boot_vpl_nodtb.py (94%) rename tools/{binman => binmanu}/etype/u_boot_with_ucode_ptr.py (97%) rename tools/{binman => binmanu}/etype/vblock.py (97%) rename tools/{binman => binmanu}/etype/x86_reset16.py (92%) rename tools/{binman => binmanu}/etype/x86_reset16_spl.py (92%) rename tools/{binman => binmanu}/etype/x86_reset16_tpl.py (92%) rename tools/{binman => binmanu}/etype/x86_start16.py (93%) rename tools/{binman => binmanu}/etype/x86_start16_spl.py (93%) rename tools/{binman => binmanu}/etype/x86_start16_tpl.py (93%) rename tools/{binman => binmanu}/fdt_test.py (100%) rename tools/{binman => binmanu}/fip_util.py (100%) rename tools/{binman => binmanu}/fip_util_test.py (99%) rename tools/{binman => binmanu}/fmap_util.py (100%) rename tools/{binman => binmanu}/ftest.py (99%) rename tools/{binman => binmanu}/image.py (99%) rename tools/{binman => binmanu}/image_test.py (98%) rename tools/{binman => binmanu}/index.rst (100%) rename tools/{binman => binmanu}/main.py (88%) rename tools/{binman => binmanu}/missing-blob-help (100%) rename tools/{binman => binmanu}/setup.py (100%) rename tools/{binman => binmanu}/state.py (100%) rename tools/{binman => binmanu}/test/001_invalid.dts (100%) rename tools/{binman => binmanu}/test/002_missing_node.dts (100%) rename tools/{binman => binmanu}/test/003_empty.dts (100%) rename tools/{binman => binmanu}/test/004_invalid_entry.dts (100%) rename tools/{binman => binmanu}/test/005_simple.dts (100%) rename tools/{binman => binmanu}/test/006_dual_image.dts (100%) rename tools/{binman => binmanu}/test/007_bad_align.dts (100%) rename tools/{binman => binmanu}/test/008_pack.dts (100%) rename tools/{binman => binmanu}/test/009_pack_extra.dts (100%) rename tools/{binman => binmanu}/test/010_pack_align_power2.dts (100%) rename tools/{binman => binmanu}/test/011_pack_align_size_power2.dts (100%) rename tools/{binman => binmanu}/test/012_pack_inv_align.dts (100%) rename tools/{binman => binmanu}/test/013_pack_inv_size_align.dts (100%) rename tools/{binman => binmanu}/test/014_pack_overlap.dts (100%) rename tools/{binman => binmanu}/test/015_pack_overflow.dts (100%) rename tools/{binman => binmanu}/test/016_pack_image_overflow.dts (100%) rename tools/{binman => binmanu}/test/017_pack_image_size.dts (100%) rename tools/{binman => binmanu}/test/018_pack_image_align.dts (100%) rename tools/{binman => binmanu}/test/019_pack_inv_image_align.dts (100%) rename tools/{binman => binmanu}/test/020_pack_inv_image_align_power2.dts (100%) rename tools/{binman => binmanu}/test/021_image_pad.dts (100%) rename tools/{binman => binmanu}/test/022_image_name.dts (100%) rename tools/{binman => binmanu}/test/023_blob.dts (100%) rename tools/{binman => binmanu}/test/024_sorted.dts (100%) rename tools/{binman => binmanu}/test/025_pack_zero_size.dts (100%) rename tools/{binman => binmanu}/test/026_pack_u_boot_dtb.dts (100%) rename tools/{binman => binmanu}/test/027_pack_4gb_no_size.dts (100%) rename tools/{binman => binmanu}/test/028_pack_4gb_outside.dts (100%) rename tools/{binman => binmanu}/test/029_x86_rom.dts (100%) rename tools/{binman => binmanu}/test/030_x86_rom_me_no_desc.dts (100%) rename tools/{binman => binmanu}/test/031_x86_rom_me.dts (100%) rename tools/{binman => binmanu}/test/032_intel_vga.dts (100%) rename tools/{binman => binmanu}/test/033_x86_start16.dts (100%) rename tools/{binman => binmanu}/test/034_x86_ucode.dts (100%) rename tools/{binman => binmanu}/test/035_x86_single_ucode.dts (100%) rename tools/{binman => binmanu}/test/036_u_boot_img.dts (100%) rename tools/{binman => binmanu}/test/037_x86_no_ucode.dts (100%) rename tools/{binman => binmanu}/test/038_x86_ucode_missing_node.dts (100%) rename tools/{binman => binmanu}/test/039_x86_ucode_missing_node2.dts (100%) rename tools/{binman => binmanu}/test/040_x86_ucode_not_in_image.dts (100%) rename tools/{binman => binmanu}/test/041_unknown_pos_size.dts (100%) rename tools/{binman => binmanu}/test/042_intel_fsp.dts (100%) rename tools/{binman => binmanu}/test/043_intel_cmc.dts (100%) rename tools/{binman => binmanu}/test/044_x86_optional_ucode.dts (100%) rename tools/{binman => binmanu}/test/045_prop_test.dts (100%) rename tools/{binman => binmanu}/test/046_intel_vbt.dts (100%) rename tools/{binman => binmanu}/test/047_spl_bss_pad.dts (100%) rename tools/{binman => binmanu}/test/048_x86_start16_spl.dts (100%) rename tools/{binman => binmanu}/test/049_x86_ucode_spl.dts (100%) rename tools/{binman => binmanu}/test/050_intel_mrc.dts (100%) rename tools/{binman => binmanu}/test/051_u_boot_spl_dtb.dts (100%) rename tools/{binman => binmanu}/test/052_u_boot_spl_nodtb.dts (100%) rename tools/{binman => binmanu}/test/053_symbols.dts (100%) rename tools/{binman => binmanu}/test/054_unit_address.dts (100%) rename tools/{binman => binmanu}/test/055_sections.dts (100%) rename tools/{binman => binmanu}/test/056_name_prefix.dts (100%) rename tools/{binman => binmanu}/test/057_unknown_contents.dts (100%) rename tools/{binman => binmanu}/test/058_x86_ucode_spl_needs_retry.dts (100%) rename tools/{binman => binmanu}/test/059_change_size.dts (100%) rename tools/{binman => binmanu}/test/060_fdt_update.dts (100%) rename tools/{binman => binmanu}/test/061_fdt_update_bad.dts (100%) rename tools/{binman => binmanu}/test/062_entry_args.dts (100%) rename tools/{binman => binmanu}/test/063_entry_args_missing.dts (100%) rename tools/{binman => binmanu}/test/064_entry_args_required.dts (100%) rename tools/{binman => binmanu}/test/065_entry_args_unknown_datatype.dts (100%) rename tools/{binman => binmanu}/test/066_text.dts (100%) rename tools/{binman => binmanu}/test/067_fmap.dts (100%) rename tools/{binman => binmanu}/test/068_blob_named_by_arg.dts (100%) rename tools/{binman => binmanu}/test/069_fill.dts (100%) rename tools/{binman => binmanu}/test/070_fill_no_size.dts (100%) rename tools/{binman => binmanu}/test/071_gbb.dts (100%) rename tools/{binman => binmanu}/test/072_gbb_too_small.dts (100%) rename tools/{binman => binmanu}/test/073_gbb_no_size.dts (100%) rename tools/{binman => binmanu}/test/074_vblock.dts (100%) rename tools/{binman => binmanu}/test/075_vblock_no_content.dts (100%) rename tools/{binman => binmanu}/test/076_vblock_bad_phandle.dts (100%) rename tools/{binman => binmanu}/test/077_vblock_bad_entry.dts (100%) rename tools/{binman => binmanu}/test/078_u_boot_tpl.dts (100%) rename tools/{binman => binmanu}/test/079_uses_pos.dts (100%) rename tools/{binman => binmanu}/test/080_fill_empty.dts (100%) rename tools/{binman => binmanu}/test/081_x86_start16_tpl.dts (100%) rename tools/{binman => binmanu}/test/082_fdt_update_all.dts (100%) rename tools/{binman => binmanu}/test/083_compress.dts (100%) rename tools/{binman => binmanu}/test/084_files.dts (100%) rename tools/{binman => binmanu}/test/085_files_compress.dts (100%) rename tools/{binman => binmanu}/test/086_files_none.dts (100%) rename tools/{binman => binmanu}/test/087_files_no_pattern.dts (100%) rename tools/{binman => binmanu}/test/088_extend_size.dts (100%) rename tools/{binman => binmanu}/test/089_extend_size_bad.dts (100%) rename tools/{binman => binmanu}/test/090_hash.dts (100%) rename tools/{binman => binmanu}/test/091_hash_no_algo.dts (100%) rename tools/{binman => binmanu}/test/092_hash_bad_algo.dts (100%) rename tools/{binman => binmanu}/test/093_x86_tpl_ucode.dts (100%) rename tools/{binman => binmanu}/test/094_fmap_x86.dts (100%) rename tools/{binman => binmanu}/test/095_fmap_x86_section.dts (100%) rename tools/{binman => binmanu}/test/096_elf.dts (100%) rename tools/{binman => binmanu}/test/097_elf_strip.dts (100%) rename tools/{binman => binmanu}/test/098_4gb_and_skip_at_start_together.dts (100%) rename tools/{binman => binmanu}/test/099_hash_section.dts (100%) rename tools/{binman => binmanu}/test/100_intel_refcode.dts (100%) rename tools/{binman => binmanu}/test/101_sections_offset.dts (100%) rename tools/{binman => binmanu}/test/102_cbfs_raw.dts (100%) rename tools/{binman => binmanu}/test/103_cbfs_raw_ppc.dts (100%) rename tools/{binman => binmanu}/test/104_cbfs_stage.dts (100%) rename tools/{binman => binmanu}/test/105_cbfs_raw_compress.dts (100%) rename tools/{binman => binmanu}/test/106_cbfs_bad_arch.dts (100%) rename tools/{binman => binmanu}/test/107_cbfs_no_size.dts (100%) rename tools/{binman => binmanu}/test/108_cbfs_no_contents.dts (100%) rename tools/{binman => binmanu}/test/109_cbfs_bad_compress.dts (100%) rename tools/{binman => binmanu}/test/110_cbfs_name.dts (100%) rename tools/{binman => binmanu}/test/111_x86_rom_ifwi.dts (100%) rename tools/{binman => binmanu}/test/112_x86_rom_ifwi_nodesc.dts (100%) rename tools/{binman => binmanu}/test/113_x86_rom_ifwi_nodata.dts (100%) rename tools/{binman => binmanu}/test/114_cbfs_offset.dts (100%) rename tools/{binman => binmanu}/test/115_fdtmap.dts (100%) rename tools/{binman => binmanu}/test/116_fdtmap_hdr.dts (100%) rename tools/{binman => binmanu}/test/117_fdtmap_hdr_start.dts (100%) rename tools/{binman => binmanu}/test/118_fdtmap_hdr_pos.dts (100%) rename tools/{binman => binmanu}/test/119_fdtmap_hdr_missing.dts (100%) rename tools/{binman => binmanu}/test/120_hdr_no_location.dts (100%) rename tools/{binman => binmanu}/test/121_entry_extend.dts (100%) rename tools/{binman => binmanu}/test/122_entry_extend_twice.dts (100%) rename tools/{binman => binmanu}/test/123_entry_extend_section.dts (100%) rename tools/{binman => binmanu}/test/124_compress_dtb.dts (100%) rename tools/{binman => binmanu}/test/125_cbfs_update.dts (100%) rename tools/{binman => binmanu}/test/126_cbfs_bad_type.dts (100%) rename tools/{binman => binmanu}/test/127_list.dts (100%) rename tools/{binman => binmanu}/test/128_decode_image.dts (100%) rename tools/{binman => binmanu}/test/129_decode_image_nohdr.dts (100%) rename tools/{binman => binmanu}/test/130_list_fdtmap.dts (100%) rename tools/{binman => binmanu}/test/131_pack_align_section.dts (100%) rename tools/{binman => binmanu}/test/132_replace.dts (100%) rename tools/{binman => binmanu}/test/133_replace_multi.dts (100%) rename tools/{binman => binmanu}/test/134_fdt_update_all_repack.dts (100%) rename tools/{binman => binmanu}/test/135_fdtmap_hdr_middle.dts (100%) rename tools/{binman => binmanu}/test/136_fdtmap_hdr_startbad.dts (100%) rename tools/{binman => binmanu}/test/137_fdtmap_hdr_endbad.dts (100%) rename tools/{binman => binmanu}/test/138_fdtmap_hdr_nosize.dts (100%) rename tools/{binman => binmanu}/test/139_replace_repack.dts (100%) rename tools/{binman => binmanu}/test/140_entry_shrink.dts (100%) rename tools/{binman => binmanu}/test/141_descriptor_offset.dts (100%) rename tools/{binman => binmanu}/test/142_replace_cbfs.dts (100%) rename tools/{binman => binmanu}/test/143_replace_all.dts (100%) rename tools/{binman => binmanu}/test/144_x86_reset16.dts (100%) rename tools/{binman => binmanu}/test/145_x86_reset16_spl.dts (100%) rename tools/{binman => binmanu}/test/146_x86_reset16_tpl.dts (100%) rename tools/{binman => binmanu}/test/147_intel_fit.dts (100%) rename tools/{binman => binmanu}/test/148_intel_fit_missing.dts (100%) rename tools/{binman => binmanu}/test/149_symbols_tpl.dts (100%) rename tools/{binman => binmanu}/test/150_powerpc_mpc85xx_bootpg_resetvec.dts (100%) rename tools/{binman => binmanu}/test/151_x86_rom_ifwi_section.dts (100%) rename tools/{binman => binmanu}/test/152_intel_fsp_m.dts (100%) rename tools/{binman => binmanu}/test/153_intel_fsp_s.dts (100%) rename tools/{binman => binmanu}/test/154_intel_fsp_t.dts (100%) rename tools/{binman => binmanu}/test/155_symbols_tpl_x86.dts (100%) rename tools/{binman => binmanu}/test/156_mkimage.dts (100%) rename tools/{binman => binmanu}/test/157_blob_ext.dts (100%) rename tools/{binman => binmanu}/test/158_blob_ext_missing.dts (100%) rename tools/{binman => binmanu}/test/159_blob_ext_missing_sect.dts (100%) rename tools/{binman => binmanu}/test/160_pack_overlap_zero.dts (100%) rename tools/{binman => binmanu}/test/161_fit.dts (100%) rename tools/{binman => binmanu}/test/162_fit_external.dts (100%) rename tools/{binman => binmanu}/test/163_x86_rom_me_empty.dts (100%) rename tools/{binman => binmanu}/test/164_x86_rom_me_missing.dts (100%) rename tools/{binman => binmanu}/test/165_section_ignore_hash_signature.dts (100%) rename tools/{binman => binmanu}/test/166_pad_in_sections.dts (100%) rename tools/{binman => binmanu}/test/167_fit_image_subentry_alignment.dts (100%) rename tools/{binman => binmanu}/test/168_fit_missing_blob.dts (100%) rename tools/{binman => binmanu}/test/169_atf_bl31.dts (100%) rename tools/{binman => binmanu}/test/170_fit_fdt.dts (100%) rename tools/{binman => binmanu}/test/171_fit_fdt_missing_prop.dts (100%) rename tools/{binman => binmanu}/test/172_scp.dts (100%) rename tools/{binman => binmanu}/test/173_missing_blob.dts (100%) rename tools/{binman => binmanu}/test/174_env.dts (100%) rename tools/{binman => binmanu}/test/175_env_no_size.dts (100%) rename tools/{binman => binmanu}/test/176_env_too_small.dts (100%) rename tools/{binman => binmanu}/test/177_skip_at_start.dts (100%) rename tools/{binman => binmanu}/test/178_skip_at_start_pad.dts (100%) rename tools/{binman => binmanu}/test/179_skip_at_start_section_pad.dts (100%) rename tools/{binman => binmanu}/test/180_section_pad.dts (100%) rename tools/{binman => binmanu}/test/181_section_align.dts (100%) rename tools/{binman => binmanu}/test/182_compress_image.dts (100%) rename tools/{binman => binmanu}/test/183_compress_image_less.dts (100%) rename tools/{binman => binmanu}/test/184_compress_section_size.dts (100%) rename tools/{binman => binmanu}/test/185_compress_section.dts (100%) rename tools/{binman => binmanu}/test/186_compress_extra.dts (100%) rename tools/{binman => binmanu}/test/187_symbols_sub.dts (100%) rename tools/{binman => binmanu}/test/188_image_entryarg.dts (100%) rename tools/{binman => binmanu}/test/189_vblock_content.dts (100%) rename tools/{binman => binmanu}/test/190_files_align.dts (100%) rename tools/{binman => binmanu}/test/191_read_image_skip.dts (100%) rename tools/{binman => binmanu}/test/192_u_boot_tpl_nodtb.dts (100%) rename tools/{binman => binmanu}/test/193_tpl_bss_pad.dts (100%) rename tools/{binman => binmanu}/test/194_fdt_incl.dts (100%) rename tools/{binman => binmanu}/test/195_fdt_incl_tpl.dts (100%) rename tools/{binman => binmanu}/test/196_symbols_nodtb.dts (100%) rename tools/{binman => binmanu}/test/197_symbols_expand.dts (100%) rename tools/{binman => binmanu}/test/198_collection.dts (100%) rename tools/{binman => binmanu}/test/199_collection_section.dts (100%) rename tools/{binman => binmanu}/test/200_align_default.dts (100%) rename tools/{binman => binmanu}/test/201_opensbi.dts (100%) rename tools/{binman => binmanu}/test/202_section_timeout.dts (100%) rename tools/{binman => binmanu}/test/203_fip.dts (100%) rename tools/{binman => binmanu}/test/204_fip_other.dts (100%) rename tools/{binman => binmanu}/test/205_fip_no_type.dts (100%) rename tools/{binman => binmanu}/test/206_fip_uuid.dts (100%) rename tools/{binman => binmanu}/test/207_fip_ls.dts (100%) rename tools/{binman => binmanu}/test/208_fip_replace.dts (100%) rename tools/{binman => binmanu}/test/209_fip_missing.dts (100%) rename tools/{binman => binmanu}/test/210_fip_size.dts (100%) rename tools/{binman => binmanu}/test/211_fip_bad_align.dts (100%) rename tools/{binman => binmanu}/test/212_fip_collection.dts (100%) rename tools/{binman => binmanu}/test/213_fdtmap_alt_format.dts (100%) rename tools/{binman => binmanu}/test/214_no_alt_format.dts (100%) rename tools/{binman => binmanu}/test/215_blob_ext_list.dts (100%) rename tools/{binman => binmanu}/test/216_blob_ext_list_missing.dts (100%) rename tools/{binman => binmanu}/test/217_fake_blob.dts (100%) rename tools/{binman => binmanu}/test/218_blob_ext_list_fake.dts (100%) rename tools/{binman => binmanu}/test/219_fit_gennode.dts (100%) rename tools/{binman => binmanu}/test/220_fit_subentry_bintool.dts (100%) rename tools/{binman => binmanu}/test/221_fit_subentry_hash.dts (100%) rename tools/{binman => binmanu}/test/222_tee_os.dts (100%) rename tools/{binman => binmanu}/test/223_fit_fdt_oper.dts (100%) rename tools/{binman => binmanu}/test/224_fit_bad_oper.dts (100%) rename tools/{binman => binmanu}/test/225_expand_size_bad.dts (100%) rename tools/{binman => binmanu}/test/226_fit_split_elf.dts (100%) rename tools/{binman => binmanu}/test/227_fit_bad_dir.dts (100%) rename tools/{binman => binmanu}/test/228_fit_bad_dir_config.dts (100%) rename tools/{binman => binmanu}/test/229_mkimage_missing.dts (100%) rename tools/{binman => binmanu}/test/230_dev.key (100%) rename tools/{binman => binmanu}/test/230_pre_load.dts (85%) rename tools/{binman => binmanu}/test/231_pre_load_pkcs.dts (87%) rename tools/{binman => binmanu}/test/232_pre_load_pss.dts (86%) rename tools/{binman => binmanu}/test/233_pre_load_invalid_padding.dts (86%) rename tools/{binman => binmanu}/test/234_pre_load_invalid_sha.dts (86%) rename tools/{binman => binmanu}/test/235_pre_load_invalid_algo.dts (86%) rename tools/{binman => binmanu}/test/236_pre_load_invalid_key.dts (86%) rename tools/{binman => binmanu}/test/237_unique_names.dts (100%) rename tools/{binman => binmanu}/test/238_unique_names_multi.dts (100%) rename tools/{binman => binmanu}/test/239_replace_with_bintool.dts (100%) rename tools/{binman => binmanu}/test/240_fit_extract_replace.dts (100%) rename tools/{binman => binmanu}/test/241_replace_section_simple.dts (100%) rename tools/{binman => binmanu}/test/242_mkimage_name.dts (100%) rename tools/{binman => binmanu}/test/243_mkimage_image.dts (100%) rename tools/{binman => binmanu}/test/244_mkimage_image_no_content.dts (100%) rename tools/{binman => binmanu}/test/245_mkimage_image_bad.dts (100%) rename tools/{binman => binmanu}/test/246_collection_other.dts (100%) rename tools/{binman => binmanu}/test/247_mkimage_coll.dts (100%) rename tools/{binman => binmanu}/test/248_compress_dtb_prepend_invalid.dts (100%) rename tools/{binman => binmanu}/test/249_compress_dtb_prepend_length.dts (100%) rename tools/{binman => binmanu}/test/250_compress_dtb_invalid.dts (100%) rename tools/{binman => binmanu}/test/251_compress_dtb_zstd.dts (100%) rename tools/{binman => binmanu}/test/252_mkimage_mult_data.dts (100%) rename tools/{binman => binmanu}/test/253_mkimage_mult_no_content.dts (100%) rename tools/{binman => binmanu}/test/254_mkimage_filename.dts (100%) rename tools/{binman => binmanu}/test/255_u_boot_vpl.dts (100%) rename tools/{binman => binmanu}/test/256_u_boot_vpl_nodtb.dts (100%) rename tools/{binman => binmanu}/test/257_fdt_incl_vpl.dts (100%) rename tools/{binman => binmanu}/test/258_vpl_bss_pad.dts (100%) rename tools/{binman => binmanu}/test/259_symlink.dts (100%) rename tools/{binman => binmanu}/test/260_symbols_elf.dts (100%) rename tools/{binman => binmanu}/test/261_section_fname.dts (100%) rename tools/{binman => binmanu}/test/262_absent.dts (100%) rename tools/{binman => binmanu}/test/263_tee_os_opt.dts (100%) rename tools/{binman => binmanu}/test/264_tee_os_opt_fit.dts (100%) rename tools/{binman => binmanu}/test/265_tee_os_opt_fit_bad.dts (100%) rename tools/{binman => binmanu}/test/266_blob_ext_opt.dts (100%) rename tools/{binman => binmanu}/test/267_section_inner.dts (100%) rename tools/{binman => binmanu}/test/268_null.dts (100%) rename tools/{binman => binmanu}/test/269_overlap.dts (100%) rename tools/{binman => binmanu}/test/270_overlap_null.dts (100%) rename tools/{binman => binmanu}/test/271_overlap_bad.dts (100%) rename tools/{binman => binmanu}/test/272_overlap_no_size.dts (100%) rename tools/{binman => binmanu}/test/273_blob_symbol.dts (100%) rename tools/{binman => binmanu}/test/274_offset_from_elf.dts (100%) rename tools/{binman => binmanu}/test/275_fit_align.dts (100%) rename tools/{binman => binmanu}/test/276_fit_firmware_loadables.dts (100%) rename tools/{binman => binmanu}/test/Makefile (100%) rename tools/{binman => binmanu}/test/blob_syms.c (100%) rename tools/{binman => binmanu}/test/blob_syms.lds (100%) rename tools/{binman => binmanu}/test/bss_data.c (100%) rename tools/{binman => binmanu}/test/bss_data.lds (100%) rename tools/{binman => binmanu}/test/descriptor.bin (100%) rename tools/{binman => binmanu}/test/elf_sections.c (100%) rename tools/{binman => binmanu}/test/elf_sections.lds (100%) rename tools/{binman => binmanu}/test/embed_data.c (100%) rename tools/{binman => binmanu}/test/embed_data.lds (100%) rename tools/{binman => binmanu}/test/files/1.dat (100%) rename tools/{binman => binmanu}/test/files/2.dat (100%) rename tools/{binman => binmanu}/test/files/ignored_dir.dat/ignore (100%) rename tools/{binman => binmanu}/test/files/not-this-one (100%) rename tools/{binman => binmanu}/test/fitimage.bin.gz (100%) rename tools/{binman => binmanu}/test/generated/autoconf.h (100%) rename tools/{binman => binmanu}/test/ifwi.bin.gz (100%) rename tools/{binman => binmanu}/test/u_boot_binman_embed.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_embed.lds (100%) rename tools/{binman => binmanu}/test/u_boot_binman_embed_sm.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms.lds (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms_bad.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms_bad.lds (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms_size.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms_x86.c (100%) rename tools/{binman => binmanu}/test/u_boot_binman_syms_x86.lds (100%) rename tools/{binman => binmanu}/test/u_boot_no_ucode_ptr.c (100%) rename tools/{binman => binmanu}/test/u_boot_ucode_ptr.c (100%) rename tools/{binman => binmanu}/test/u_boot_ucode_ptr.lds (100%)

diff --git a/scripts/event_dump.py b/scripts/event_dump.py index 0117457526e..36786c7f1da 100755 --- a/scripts/event_dump.py +++ b/scripts/event_dump.py @@ -14,7 +14,7 @@ src_path = os.path.dirname(our_path)

sys.path.insert(1, os.path.join(our_path, '../tools'))

-from binman import elf +from binmanu import elf from u_boot_pylib import tools

# A typical symbol looks like this: diff --git a/tools/binman b/tools/binman new file mode 120000 index 00000000000..fa81612af0f --- /dev/null +++ b/tools/binman @@ -0,0 +1 @@ +binmanu \ No newline at end of file diff --git a/tools/binman/.gitignore b/tools/binmanu/.gitignore similarity index 100% rename from tools/binman/.gitignore rename to tools/binmanu/.gitignore diff --git a/tools/binman/README.rst b/tools/binmanu/README.rst similarity index 100% rename from tools/binman/README.rst rename to tools/binmanu/README.rst diff --git a/tools/binman/__init__.py b/tools/binmanu/__init__.py similarity index 100% rename from tools/binman/__init__.py rename to tools/binmanu/__init__.py diff --git a/tools/binman/binman b/tools/binmanu/binman similarity index 100% rename from tools/binman/binman rename to tools/binmanu/binman diff --git a/tools/binman/binman.rst b/tools/binmanu/binman.rst similarity index 100% rename from tools/binman/binman.rst rename to tools/binmanu/binman.rst diff --git a/tools/binman/bintool.py b/tools/binmanu/bintool.py similarity index 99% rename from tools/binman/bintool.py rename to tools/binmanu/bintool.py index 745b62b5a20..5d4fa88569f 100644 --- a/tools/binman/bintool.py +++ b/tools/binmanu/bintool.py @@ -80,12 +80,12 @@ class Bintool: # Import the module if we have not already done so if not module: try: - module = importlib.import_module('binman.btool.' + module_name) + module = importlib.import_module('binmanu.btool.' + module_name) except ImportError as exc: try: # Deal with classes which must be renamed due to conflicts # with Python libraries - module = importlib.import_module('binman.btool.btool_' + + module = importlib.import_module('binmanu.btool.btool_' + module_name) except ImportError: return module_name, exc diff --git a/tools/binman/bintool_test.py b/tools/binmanu/bintool_test.py similarity index 99% rename from tools/binman/bintool_test.py rename to tools/binmanu/bintool_test.py index 87a6b11e676..41703fd283c 100644 --- a/tools/binman/bintool_test.py +++ b/tools/binmanu/bintool_test.py @@ -13,8 +13,8 @@ import unittest import unittest.mock import urllib.error

-from binman import bintool -from binman.bintool import Bintool +from binmanu import bintool +from binmanu.bintool import Bintool

from u_boot_pylib import command from u_boot_pylib import terminal @@ -42,7 +42,7 @@ class TestBintool(unittest.TestCase): """Test that unknown bintool types are detected""" with self.assertRaises(ValueError) as exc: Bintool.create('missing') - self.assertIn("No module named 'binman.btool.missing'", + self.assertIn("No module named 'binmanu.btool.missing'", str(exc.exception))

def test_fresh_bintool(self): diff --git a/tools/binman/bintools.rst b/tools/binmanu/bintools.rst similarity index 100% rename from tools/binman/bintools.rst rename to tools/binmanu/bintools.rst diff --git a/tools/binman/btool/_testing.py b/tools/binmanu/btool/_testing.py similarity index 97% rename from tools/binman/btool/_testing.py rename to tools/binmanu/btool/_testing.py index 4005e8a8a5d..5bb11f45f33 100644 --- a/tools/binman/btool/_testing.py +++ b/tools/binmanu/btool/_testing.py @@ -5,7 +5,7 @@

This is not a real bintool, just one used for testing"""

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintool_testing(bintool.Bintool): diff --git a/tools/binman/btool/btool_gzip.py b/tools/binmanu/btool/btool_gzip.py similarity index 96% rename from tools/binman/btool/btool_gzip.py rename to tools/binmanu/btool/btool_gzip.py index 0d75028120f..fe0b46cf638 100644 --- a/tools/binman/btool/btool_gzip.py +++ b/tools/binmanu/btool/btool_gzip.py @@ -11,7 +11,7 @@ Documentation is available via:: man gzip """

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintoolgzip(bintool.BintoolPacker): diff --git a/tools/binman/btool/bzip2.py b/tools/binmanu/btool/bzip2.py similarity index 96% rename from tools/binman/btool/bzip2.py rename to tools/binmanu/btool/bzip2.py index c3897d63acb..454cd1dfd51 100644 --- a/tools/binman/btool/bzip2.py +++ b/tools/binmanu/btool/bzip2.py @@ -11,7 +11,7 @@ Documentation is available via:: man bzip2 """

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintoolbzip2(bintool.BintoolPacker): diff --git a/tools/binman/btool/cbfstool.py b/tools/binmanu/btool/cbfstool.py similarity index 99% rename from tools/binman/btool/cbfstool.py rename to tools/binmanu/btool/cbfstool.py index 29be2d8a2b5..bc8277928be 100644 --- a/tools/binman/btool/cbfstool.py +++ b/tools/binmanu/btool/cbfstool.py @@ -113,7 +113,7 @@ Since binman has a native implementation of CBFS (see cbfs_util.py), we don't actually need this tool, except for sanity checks in the tests. """

-from binman import bintool +from binmanu import bintool

class Bintoolcbfstool(bintool.Bintool): """Coreboot filesystem (CBFS) tool diff --git a/tools/binman/btool/fiptool.py b/tools/binmanu/btool/fiptool.py similarity index 99% rename from tools/binman/btool/fiptool.py rename to tools/binmanu/btool/fiptool.py index c80f8275c4c..3122d2a0f3c 100644 --- a/tools/binman/btool/fiptool.py +++ b/tools/binmanu/btool/fiptool.py @@ -29,7 +29,7 @@ Commands supported:

"""

-from binman import bintool +from binmanu import bintool

class Bintoolfiptool(bintool.Bintool): """Image generation for ARM Trusted Firmware diff --git a/tools/binman/btool/futility.py b/tools/binmanu/btool/futility.py similarity index 99% rename from tools/binman/btool/futility.py rename to tools/binmanu/btool/futility.py index 04c9aefe9b4..bbb568f8568 100644 --- a/tools/binman/btool/futility.py +++ b/tools/binmanu/btool/futility.py @@ -52,7 +52,7 @@ The following commands are built-in: version Show the futility source revision and build date """

-from binman import bintool +from binmanu import bintool

class Bintoolfutility(bintool.Bintool): """Handles the 'futility' tool diff --git a/tools/binman/btool/ifwitool.py b/tools/binmanu/btool/ifwitool.py similarity index 99% rename from tools/binman/btool/ifwitool.py rename to tools/binmanu/btool/ifwitool.py index 96778fce87f..ff4f4220709 100644 --- a/tools/binman/btool/ifwitool.py +++ b/tools/binmanu/btool/ifwitool.py @@ -56,7 +56,7 @@ UEP(UEP) UFS_RATE_B(UFS Rate B Config) """

-from binman import bintool +from binmanu import bintool

class Bintoolifwitool(bintool.Bintool): """Handles the 'ifwitool' tool diff --git a/tools/binman/btool/lz4.py b/tools/binmanu/btool/lz4.py similarity index 99% rename from tools/binman/btool/lz4.py rename to tools/binmanu/btool/lz4.py index fd520d13a56..dd663101095 100644 --- a/tools/binman/btool/lz4.py +++ b/tools/binmanu/btool/lz4.py @@ -59,7 +59,7 @@ Benchmark arguments : import re import tempfile

-from binman import bintool +from binmanu import bintool from u_boot_pylib import tools

# pylint: disable=C0103 diff --git a/tools/binman/btool/lzma_alone.py b/tools/binmanu/btool/lzma_alone.py similarity index 99% rename from tools/binman/btool/lzma_alone.py rename to tools/binmanu/btool/lzma_alone.py index 1fda2f68c7b..bf8bfd8983f 100644 --- a/tools/binman/btool/lzma_alone.py +++ b/tools/binmanu/btool/lzma_alone.py @@ -36,7 +36,7 @@ Usage: LZMA <e|d> inputFile outputFile [<switches>...] import re import tempfile

-from binman import bintool +from binmanu import bintool from u_boot_pylib import tools

# pylint: disable=C0103 diff --git a/tools/binman/btool/lzop.py b/tools/binmanu/btool/lzop.py similarity index 96% rename from tools/binman/btool/lzop.py rename to tools/binmanu/btool/lzop.py index f6903b4db75..0815077c9ff 100644 --- a/tools/binman/btool/lzop.py +++ b/tools/binmanu/btool/lzop.py @@ -11,7 +11,7 @@ Documentation is available via:: man lzop """

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintoollzop(bintool.BintoolPacker): diff --git a/tools/binman/btool/mkimage.py b/tools/binmanu/btool/mkimage.py similarity index 98% rename from tools/binman/btool/mkimage.py rename to tools/binmanu/btool/mkimage.py index d5b407c5547..ba30dcf86b7 100644 --- a/tools/binman/btool/mkimage.py +++ b/tools/binmanu/btool/mkimage.py @@ -5,7 +5,7 @@

import re

-from binman import bintool +from binmanu import bintool

class Bintoolmkimage(bintool.Bintool): """Image generation for U-Boot diff --git a/tools/binman/btool/xz.py b/tools/binmanu/btool/xz.py similarity index 96% rename from tools/binman/btool/xz.py rename to tools/binmanu/btool/xz.py index e2b413d18bd..0b91702b900 100644 --- a/tools/binman/btool/xz.py +++ b/tools/binmanu/btool/xz.py @@ -11,7 +11,7 @@ Documentation is available via:: man xz """

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintoolxz(bintool.BintoolPacker): diff --git a/tools/binman/btool/zstd.py b/tools/binmanu/btool/zstd.py similarity index 96% rename from tools/binman/btool/zstd.py rename to tools/binmanu/btool/zstd.py index 299bd371269..9ae6c94d47a 100644 --- a/tools/binman/btool/zstd.py +++ b/tools/binmanu/btool/zstd.py @@ -11,7 +11,7 @@ Documentation is available via:: man zstd """

-from binman import bintool +from binmanu import bintool

# pylint: disable=C0103 class Bintoolzstd(bintool.BintoolPacker): diff --git a/tools/binman/cbfs_util.py b/tools/binmanu/cbfs_util.py similarity index 99% rename from tools/binman/cbfs_util.py rename to tools/binmanu/cbfs_util.py index fc56b40b753..83ac3161956 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binmanu/cbfs_util.py @@ -20,8 +20,8 @@ import io import struct import sys

-from binman import bintool -from binman import elf +from binmanu import bintool +from binmanu import elf from u_boot_pylib import command from u_boot_pylib import tools

diff --git a/tools/binman/cbfs_util_test.py b/tools/binmanu/cbfs_util_test.py similarity index 99% rename from tools/binman/cbfs_util_test.py rename to tools/binmanu/cbfs_util_test.py index ee951d10cf3..86bca2654ea 100755 --- a/tools/binman/cbfs_util_test.py +++ b/tools/binmanu/cbfs_util_test.py @@ -16,10 +16,10 @@ import struct import tempfile import unittest

-from binman import bintool -from binman import cbfs_util -from binman.cbfs_util import CbfsWriter -from binman import elf +from binmanu import bintool +from binmanu import cbfs_util +from binmanu.cbfs_util import CbfsWriter +from binmanu import elf from u_boot_pylib import test_util from u_boot_pylib import tools

diff --git a/tools/binman/cmdline.py b/tools/binmanu/cmdline.py similarity index 99% rename from tools/binman/cmdline.py rename to tools/binmanu/cmdline.py index 986d6f1a315..81c01d914ff 100644 --- a/tools/binman/cmdline.py +++ b/tools/binmanu/cmdline.py @@ -7,7 +7,7 @@

import argparse from argparse import ArgumentParser -from binman import state +from binmanu import state

def make_extract_parser(subparsers): """make_extract_parser: Make a subparser for the 'extract' command diff --git a/tools/binman/control.py b/tools/binmanu/control.py similarity index 99% rename from tools/binman/control.py rename to tools/binmanu/control.py index 3e27b72f881..b7d50f8d76a 100644 --- a/tools/binman/control.py +++ b/tools/binmanu/control.py @@ -13,10 +13,10 @@ import re

import sys

-from binman import bintool -from binman import cbfs_util -from binman import elf -from binman import entry +from binmanu import bintool +from binmanu import cbfs_util +from binmanu import elf +from binmanu import entry from u_boot_pylib import command from u_boot_pylib import tools from u_boot_pylib import tout @@ -151,7 +151,7 @@ def WriteEntryDocs(modules, test_missing=None): to show as missing even if it is present. Should be set to None in normal use. """ - from binman.entry import Entry + from binmanu.entry import Entry Entry.WriteDocs(modules, test_missing)

@@ -213,7 +213,7 @@ def ReadEntry(image_fname, entry_path, decomp=True): data extracted from the entry """ global Image - from binman.image import Image + from binmanu.image import Image

image = Image.FromFile(image_fname) image.CollectBintools() @@ -647,8 +647,8 @@ def Binman(args): return 0

# Put these here so that we can import this module without libfdt - from binman.image import Image - from binman import state + from binmanu.image import Image + from binmanu import state

if args.cmd in ['ls', 'extract', 'replace', 'tool']: try: diff --git a/tools/binman/elf.py b/tools/binmanu/elf.py similarity index 99% rename from tools/binman/elf.py rename to tools/binmanu/elf.py index 5816284c32a..c81e4e5641a 100644 --- a/tools/binman/elf.py +++ b/tools/binmanu/elf.py @@ -341,7 +341,7 @@ def MakeElf(elf_fname, text, data): text: Text (code) to put in the file's .text section data: Data to put in the file's .data section """ - outdir = tempfile.mkdtemp(prefix='binman.elf.') + outdir = tempfile.mkdtemp(prefix='binmanu.elf.') s_file = os.path.join(outdir, 'elf.S')

# Spilt the text into two parts so that we can make the entry point two diff --git a/tools/binman/elf_test.py b/tools/binmanu/elf_test.py similarity index 99% rename from tools/binman/elf_test.py rename to tools/binmanu/elf_test.py index c98083961b5..af8fbfd2584 100644 --- a/tools/binman/elf_test.py +++ b/tools/binmanu/elf_test.py @@ -11,7 +11,7 @@ import sys import tempfile import unittest

-from binman import elf +from binmanu import elf from u_boot_pylib import command from u_boot_pylib import test_util from u_boot_pylib import tools diff --git a/tools/binman/entries.rst b/tools/binmanu/entries.rst similarity index 100% rename from tools/binman/entries.rst rename to tools/binmanu/entries.rst diff --git a/tools/binman/entry.py b/tools/binmanu/entry.py similarity index 99% rename from tools/binman/entry.py rename to tools/binmanu/entry.py index 13224523978..05cc46287df 100644 --- a/tools/binman/entry.py +++ b/tools/binmanu/entry.py @@ -11,8 +11,8 @@ import pathlib import sys import time

-from binman import bintool -from binman import elf +from binmanu import bintool +from binmanu import elf from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib.tools import to_hex, to_hex_size @@ -107,7 +107,7 @@ class Entry(object): auto_write_symbols=False): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

self.section = section self.etype = etype @@ -180,7 +180,7 @@ class Entry(object): # Import the module if we have not already done so. if not module: try: - module = importlib.import_module('binman.etype.' + module_name) + module = importlib.import_module('binmanu.etype.' + module_name) except ImportError as e: if expanded: return None diff --git a/tools/binman/entry_test.py b/tools/binmanu/entry_test.py similarity index 97% rename from tools/binman/entry_test.py rename to tools/binmanu/entry_test.py index ac6582cf86a..15564faa39f 100644 --- a/tools/binman/entry_test.py +++ b/tools/binmanu/entry_test.py @@ -10,8 +10,8 @@ import os import sys import unittest

-from binman import entry -from binman.etype.blob import Entry_blob +from binmanu import entry +from binmanu.etype.blob import Entry_blob from dtoc import fdt from dtoc import fdt_util from u_boot_pylib import tools @@ -35,11 +35,11 @@ class TestEntry(unittest.TestCase): if entry: importlib.reload(entry) else: - from binman import entry + from binmanu import entry

def testEntryContents(self): """Test the Entry bass class""" - from binman import entry + from binmanu import entry base_entry = entry.Entry(None, None, None) self.assertEqual(True, base_entry.ObtainContents())

diff --git a/tools/binman/etype/_testing.py b/tools/binmanu/etype/_testing.py similarity index 99% rename from tools/binman/etype/_testing.py rename to tools/binmanu/etype/_testing.py index e092d98ce15..1751fbc71d6 100644 --- a/tools/binman/etype/_testing.py +++ b/tools/binmanu/etype/_testing.py @@ -7,7 +7,7 @@

from collections import OrderedDict

-from binman.entry import Entry, EntryArg +from binmanu.entry import Entry, EntryArg from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/atf_bl31.py b/tools/binmanu/etype/atf_bl31.py similarity index 92% rename from tools/binman/etype/atf_bl31.py rename to tools/binmanu/etype/atf_bl31.py index 2041da416c9..7db63664b07 100644 --- a/tools/binman/etype/atf_bl31.py +++ b/tools/binmanu/etype/atf_bl31.py @@ -5,7 +5,7 @@ # Entry-type module for ARM Trusted Firmware binary blob #

-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg +from binmanu.etype.blob_named_by_arg import Entry_blob_named_by_arg

class Entry_atf_bl31(Entry_blob_named_by_arg): """ARM Trusted Firmware (ATF) BL31 blob diff --git a/tools/binman/etype/atf_fip.py b/tools/binmanu/etype/atf_fip.py similarity index 98% rename from tools/binman/etype/atf_fip.py rename to tools/binmanu/etype/atf_fip.py index d5b862040b4..73c69a7b784 100644 --- a/tools/binman/etype/atf_fip.py +++ b/tools/binmanu/etype/atf_fip.py @@ -7,9 +7,9 @@

from collections import OrderedDict

-from binman.entry import Entry -from binman.etype.section import Entry_section -from binman.fip_util import FIP_TYPES, FipReader, FipWriter, UUID_LEN +from binmanu.entry import Entry +from binmanu.etype.section import Entry_section +from binmanu.fip_util import FIP_TYPES, FipReader, FipWriter, UUID_LEN from dtoc import fdt_util from u_boot_pylib import tools

@@ -168,7 +168,7 @@ class Entry_atf_fip(Entry_section): def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node) self.align_default = None diff --git a/tools/binman/etype/blob.py b/tools/binmanu/etype/blob.py similarity index 98% rename from tools/binman/etype/blob.py rename to tools/binmanu/etype/blob.py index f9c4e33b110..ad54d48a2e1 100644 --- a/tools/binman/etype/blob.py +++ b/tools/binmanu/etype/blob.py @@ -5,8 +5,8 @@ # Entry-type module for blobs, which are binary objects read from files #

-from binman.entry import Entry -from binman import state +from binmanu.entry import Entry +from binmanu import state from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib import tout diff --git a/tools/binman/etype/blob_dtb.py b/tools/binmanu/etype/blob_dtb.py similarity index 96% rename from tools/binman/etype/blob_dtb.py rename to tools/binmanu/etype/blob_dtb.py index 6a3fbc47753..468c1a8128c 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binmanu/etype/blob_dtb.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree files #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from dtoc import fdt_util import struct

@@ -26,7 +26,7 @@ class Entry_blob_dtb(Entry_blob): def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node) self.prepend = None diff --git a/tools/binman/etype/blob_ext.py b/tools/binmanu/etype/blob_ext.py similarity index 96% rename from tools/binman/etype/blob_ext.py rename to tools/binmanu/etype/blob_ext.py index 9eb762b0a23..0d1c2db48c3 100644 --- a/tools/binman/etype/blob_ext.py +++ b/tools/binmanu/etype/blob_ext.py @@ -7,7 +7,7 @@

import os

-from binman.etype.blob import Entry_blob +from binmanu.etype.blob import Entry_blob from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib import tout diff --git a/tools/binman/etype/blob_ext_list.py b/tools/binmanu/etype/blob_ext_list.py similarity index 97% rename from tools/binman/etype/blob_ext_list.py rename to tools/binmanu/etype/blob_ext_list.py index 1bfcf6733a7..549b6bbfb00 100644 --- a/tools/binman/etype/blob_ext_list.py +++ b/tools/binmanu/etype/blob_ext_list.py @@ -7,7 +7,7 @@

import os

-from binman.etype.blob import Entry_blob +from binmanu.etype.blob import Entry_blob from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib import tout diff --git a/tools/binman/etype/blob_named_by_arg.py b/tools/binmanu/etype/blob_named_by_arg.py similarity index 94% rename from tools/binman/etype/blob_named_by_arg.py rename to tools/binmanu/etype/blob_named_by_arg.py index 7c486b2dc91..56e58868510 100644 --- a/tools/binman/etype/blob_named_by_arg.py +++ b/tools/binmanu/etype/blob_named_by_arg.py @@ -8,8 +8,8 @@

from collections import OrderedDict

-from binman.etype.blob import Entry_blob -from binman.entry import EntryArg +from binmanu.etype.blob import Entry_blob +from binmanu.entry import EntryArg

class Entry_blob_named_by_arg(Entry_blob): diff --git a/tools/binman/etype/blob_phase.py b/tools/binmanu/etype/blob_phase.py similarity index 95% rename from tools/binman/etype/blob_phase.py rename to tools/binmanu/etype/blob_phase.py index b937158756f..c6fd37a2728 100644 --- a/tools/binman/etype/blob_phase.py +++ b/tools/binmanu/etype/blob_phase.py @@ -5,7 +5,7 @@ # Entry-type base class for U-Boot or SPL binary with devicetree #

-from binman.etype.section import Entry_section +from binmanu.etype.section import Entry_section

# This is imported if needed state = None @@ -35,7 +35,7 @@ class Entry_blob_phase(Entry_section): """ # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node) self.root_fname = root_fname diff --git a/tools/binman/etype/cbfs.py b/tools/binmanu/etype/cbfs.py similarity index 98% rename from tools/binman/etype/cbfs.py rename to tools/binmanu/etype/cbfs.py index 832f8d038f0..edb51388e20 100644 --- a/tools/binman/etype/cbfs.py +++ b/tools/binmanu/etype/cbfs.py @@ -7,9 +7,9 @@

from collections import OrderedDict

-from binman import cbfs_util -from binman.cbfs_util import CbfsWriter -from binman.entry import Entry +from binmanu import cbfs_util +from binmanu.cbfs_util import CbfsWriter +from binmanu.entry import Entry from dtoc import fdt_util

# This is imported if needed @@ -168,7 +168,7 @@ class Entry_cbfs(Entry): def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node) self.align_default = None diff --git a/tools/binman/etype/collection.py b/tools/binmanu/etype/collection.py similarity index 98% rename from tools/binman/etype/collection.py rename to tools/binmanu/etype/collection.py index c532aafe3e7..962e043bda0 100644 --- a/tools/binman/etype/collection.py +++ b/tools/binmanu/etype/collection.py @@ -8,7 +8,7 @@ from collections import OrderedDict import os

-from binman.entry import Entry +from binmanu.entry import Entry from dtoc import fdt_util

class Entry_collection(Entry): diff --git a/tools/binman/etype/cros_ec_rw.py b/tools/binmanu/etype/cros_ec_rw.py similarity index 91% rename from tools/binman/etype/cros_ec_rw.py rename to tools/binmanu/etype/cros_ec_rw.py index bf676b2d1a7..ef5450a92a6 100644 --- a/tools/binman/etype/cros_ec_rw.py +++ b/tools/binmanu/etype/cros_ec_rw.py @@ -5,7 +5,7 @@ # Entry-type module for a Chromium OS EC image (read-write section) #

-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg +from binmanu.etype.blob_named_by_arg import Entry_blob_named_by_arg

class Entry_cros_ec_rw(Entry_blob_named_by_arg): """A blob entry which contains a Chromium OS read-write EC image diff --git a/tools/binman/etype/fdtmap.py b/tools/binmanu/etype/fdtmap.py similarity index 98% rename from tools/binman/etype/fdtmap.py rename to tools/binmanu/etype/fdtmap.py index f1f6217940f..ff2bf058745 100644 --- a/tools/binman/etype/fdtmap.py +++ b/tools/binmanu/etype/fdtmap.py @@ -8,7 +8,7 @@ This handles putting an FDT into the image with just the information about the image. """

-from binman.entry import Entry +from binmanu.entry import Entry from u_boot_pylib import tools from u_boot_pylib import tout

@@ -91,7 +91,7 @@ class Entry_fdtmap(Entry): global Fdt

import libfdt - from binman import state + from binmanu import state from dtoc.fdt import Fdt

super().__init__(section, etype, node) diff --git a/tools/binman/etype/files.py b/tools/binmanu/etype/files.py similarity index 96% rename from tools/binman/etype/files.py rename to tools/binmanu/etype/files.py index c8757eafab1..1ab263dea49 100644 --- a/tools/binman/etype/files.py +++ b/tools/binmanu/etype/files.py @@ -9,7 +9,7 @@ import glob import os

-from binman.etype.section import Entry_section +from binmanu.etype.section import Entry_section from dtoc import fdt_util from u_boot_pylib import tools

@@ -33,7 +33,7 @@ class Entry_files(Entry_section): def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node)

diff --git a/tools/binman/etype/fill.py b/tools/binmanu/etype/fill.py similarity index 97% rename from tools/binman/etype/fill.py rename to tools/binmanu/etype/fill.py index 7c93d4e2689..640afc33222 100644 --- a/tools/binman/etype/fill.py +++ b/tools/binmanu/etype/fill.py @@ -3,7 +3,7 @@ # Written by Simon Glass sjg@chromium.org #

-from binman.entry import Entry +from binmanu.entry import Entry from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/fit.py b/tools/binmanu/etype/fit.py similarity index 99% rename from tools/binman/etype/fit.py rename to tools/binmanu/etype/fit.py index 9d34aabd19a..14e0ba97c6b 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binmanu/etype/fit.py @@ -7,9 +7,9 @@

import libfdt

-from binman.entry import Entry, EntryArg -from binman.etype.section import Entry_section -from binman import elf +from binmanu.entry import Entry, EntryArg +from binmanu.etype.section import Entry_section +from binmanu import elf from dtoc import fdt_util from dtoc.fdt import Fdt from u_boot_pylib import tools diff --git a/tools/binman/etype/fmap.py b/tools/binmanu/etype/fmap.py similarity index 98% rename from tools/binman/etype/fmap.py rename to tools/binmanu/etype/fmap.py index dacdafd8f6f..ebc3c07f093 100644 --- a/tools/binman/etype/fmap.py +++ b/tools/binmanu/etype/fmap.py @@ -5,8 +5,8 @@ # Entry-type module for a Flash map, as used by the flashrom SPI flash tool #

-from binman.entry import Entry -from binman import fmap_util +from binmanu.entry import Entry +from binmanu import fmap_util from u_boot_pylib import tools from u_boot_pylib.tools import to_hex_size from u_boot_pylib import tout diff --git a/tools/binman/etype/gbb.py b/tools/binmanu/etype/gbb.py similarity index 98% rename from tools/binman/etype/gbb.py rename to tools/binmanu/etype/gbb.py index cca18af6e2f..e56eff580ee 100644 --- a/tools/binman/etype/gbb.py +++ b/tools/binmanu/etype/gbb.py @@ -9,7 +9,7 @@ from collections import OrderedDict

from u_boot_pylib import command -from binman.entry import Entry, EntryArg +from binmanu.entry import Entry, EntryArg

from dtoc import fdt_util from u_boot_pylib import tools diff --git a/tools/binman/etype/image_header.py b/tools/binmanu/etype/image_header.py similarity index 99% rename from tools/binman/etype/image_header.py rename to tools/binmanu/etype/image_header.py index 24011884958..4731b215afa 100644 --- a/tools/binman/etype/image_header.py +++ b/tools/binmanu/etype/image_header.py @@ -11,7 +11,7 @@ image.

import struct

-from binman.entry import Entry +from binmanu.entry import Entry from dtoc import fdt_util

IMAGE_HEADER_MAGIC = b'BinM' diff --git a/tools/binman/etype/intel_cmc.py b/tools/binmanu/etype/intel_cmc.py similarity index 92% rename from tools/binman/etype/intel_cmc.py rename to tools/binmanu/etype/intel_cmc.py index 494d43c9cf9..6eca6fe0881 100644 --- a/tools/binman/etype/intel_cmc.py +++ b/tools/binmanu/etype/intel_cmc.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Chip Microcode binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_cmc(Entry_blob_ext): """Intel Chipset Micro Code (CMC) file diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binmanu/etype/intel_descriptor.py similarity index 97% rename from tools/binman/etype/intel_descriptor.py rename to tools/binmanu/etype/intel_descriptor.py index 7fe88a9ec1a..a8ab34c89bf 100644 --- a/tools/binman/etype/intel_descriptor.py +++ b/tools/binmanu/etype/intel_descriptor.py @@ -7,8 +7,8 @@

import struct

-from binman.entry import Entry -from binman.etype.blob_ext import Entry_blob_ext +from binmanu.entry import Entry +from binmanu.etype.blob_ext import Entry_blob_ext

FD_SIGNATURE = struct.pack('<L', 0x0ff0a55a) MAX_REGIONS = 5 diff --git a/tools/binman/etype/intel_fit.py b/tools/binmanu/etype/intel_fit.py similarity index 94% rename from tools/binman/etype/intel_fit.py rename to tools/binmanu/etype/intel_fit.py index f1a10c55a67..6aa8958de0c 100644 --- a/tools/binman/etype/intel_fit.py +++ b/tools/binmanu/etype/intel_fit.py @@ -7,7 +7,7 @@

import struct

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fit(Entry_blob_ext): """Intel Firmware Image Table (FIT) diff --git a/tools/binman/etype/intel_fit_ptr.py b/tools/binmanu/etype/intel_fit_ptr.py similarity index 96% rename from tools/binman/etype/intel_fit_ptr.py rename to tools/binmanu/etype/intel_fit_ptr.py index 01f082281c5..0c67a2ae565 100644 --- a/tools/binman/etype/intel_fit_ptr.py +++ b/tools/binmanu/etype/intel_fit_ptr.py @@ -7,7 +7,7 @@

import struct

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fit_ptr(Entry_blob_ext): """Intel Firmware Image Table (FIT) pointer diff --git a/tools/binman/etype/intel_fsp.py b/tools/binmanu/etype/intel_fsp.py similarity index 94% rename from tools/binman/etype/intel_fsp.py rename to tools/binmanu/etype/intel_fsp.py index 326cb7d09b3..f2cc499029b 100644 --- a/tools/binman/etype/intel_fsp.py +++ b/tools/binmanu/etype/intel_fsp.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Firmware Support Package binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fsp(Entry_blob_ext): """Intel Firmware Support Package (FSP) file diff --git a/tools/binman/etype/intel_fsp_m.py b/tools/binmanu/etype/intel_fsp_m.py similarity index 94% rename from tools/binman/etype/intel_fsp_m.py rename to tools/binmanu/etype/intel_fsp_m.py index 9bcac790ed9..efaadde033f 100644 --- a/tools/binman/etype/intel_fsp_m.py +++ b/tools/binmanu/etype/intel_fsp_m.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Firmware Support Package binary blob (M section) #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fsp_m(Entry_blob_ext): """Intel Firmware Support Package (FSP) memory init diff --git a/tools/binman/etype/intel_fsp_s.py b/tools/binmanu/etype/intel_fsp_s.py similarity index 94% rename from tools/binman/etype/intel_fsp_s.py rename to tools/binmanu/etype/intel_fsp_s.py index 1d5046d452b..eebbcaa42b6 100644 --- a/tools/binman/etype/intel_fsp_s.py +++ b/tools/binmanu/etype/intel_fsp_s.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Firmware Support Package binary blob (S section) #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fsp_s(Entry_blob_ext): """Intel Firmware Support Package (FSP) silicon init diff --git a/tools/binman/etype/intel_fsp_t.py b/tools/binmanu/etype/intel_fsp_t.py similarity index 94% rename from tools/binman/etype/intel_fsp_t.py rename to tools/binmanu/etype/intel_fsp_t.py index 80d95cc6f9c..b9198c317de 100644 --- a/tools/binman/etype/intel_fsp_t.py +++ b/tools/binmanu/etype/intel_fsp_t.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Firmware Support Package binary blob (T section) #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_fsp_t(Entry_blob_ext): """Intel Firmware Support Package (FSP) temp ram init diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binmanu/etype/intel_ifwi.py similarity index 98% rename from tools/binman/etype/intel_ifwi.py rename to tools/binmanu/etype/intel_ifwi.py index 6513b97c3e5..5d9a2a30112 100644 --- a/tools/binman/etype/intel_ifwi.py +++ b/tools/binmanu/etype/intel_ifwi.py @@ -7,8 +7,8 @@

from collections import OrderedDict

-from binman.entry import Entry -from binman.etype.blob_ext import Entry_blob_ext +from binmanu.entry import Entry +from binmanu.etype.blob_ext import Entry_blob_ext from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/intel_me.py b/tools/binmanu/etype/intel_me.py similarity index 95% rename from tools/binman/etype/intel_me.py rename to tools/binmanu/etype/intel_me.py index b93ebabdc9e..b2b2e196e27 100644 --- a/tools/binman/etype/intel_me.py +++ b/tools/binmanu/etype/intel_me.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Management Engine binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_me(Entry_blob_ext): """Intel Management Engine (ME) file diff --git a/tools/binman/etype/intel_mrc.py b/tools/binmanu/etype/intel_mrc.py similarity index 93% rename from tools/binman/etype/intel_mrc.py rename to tools/binmanu/etype/intel_mrc.py index bb8b26ff686..7b27871d5af 100644 --- a/tools/binman/etype/intel_mrc.py +++ b/tools/binmanu/etype/intel_mrc.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Memory Reference Code binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_mrc(Entry_blob_ext): """Intel Memory Reference Code (MRC) file diff --git a/tools/binman/etype/intel_refcode.py b/tools/binmanu/etype/intel_refcode.py similarity index 93% rename from tools/binman/etype/intel_refcode.py rename to tools/binmanu/etype/intel_refcode.py index 9112730a9a4..257ad32f677 100644 --- a/tools/binman/etype/intel_refcode.py +++ b/tools/binmanu/etype/intel_refcode.py @@ -5,7 +5,7 @@ # Entry-type module for Intel Memory Reference Code binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_refcode(Entry_blob_ext): """Intel Reference Code file diff --git a/tools/binman/etype/intel_vbt.py b/tools/binmanu/etype/intel_vbt.py similarity index 92% rename from tools/binman/etype/intel_vbt.py rename to tools/binmanu/etype/intel_vbt.py index 8afd576600c..3050bcf4b4a 100644 --- a/tools/binman/etype/intel_vbt.py +++ b/tools/binmanu/etype/intel_vbt.py @@ -4,7 +4,7 @@ # Entry-type module for Intel Video BIOS Table binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_vbt(Entry_blob_ext): """Intel Video BIOS Table (VBT) file diff --git a/tools/binman/etype/intel_vga.py b/tools/binmanu/etype/intel_vga.py similarity index 93% rename from tools/binman/etype/intel_vga.py rename to tools/binmanu/etype/intel_vga.py index 51e6465f0d0..de3be8e9beb 100644 --- a/tools/binman/etype/intel_vga.py +++ b/tools/binmanu/etype/intel_vga.py @@ -5,7 +5,7 @@ # Entry-type module for x86 VGA ROM binary blob #

-from binman.etype.blob_ext import Entry_blob_ext +from binmanu.etype.blob_ext import Entry_blob_ext

class Entry_intel_vga(Entry_blob_ext): """Intel Video Graphics Adaptor (VGA) file diff --git a/tools/binman/etype/mkimage.py b/tools/binmanu/etype/mkimage.py similarity index 99% rename from tools/binman/etype/mkimage.py rename to tools/binmanu/etype/mkimage.py index 27a0c4bd7c6..dd68b1530da 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binmanu/etype/mkimage.py @@ -7,7 +7,7 @@

from collections import OrderedDict

-from binman.entry import Entry +from binmanu.entry import Entry from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/null.py b/tools/binmanu/etype/null.py similarity index 95% rename from tools/binman/etype/null.py rename to tools/binmanu/etype/null.py index 263fb5244df..024d06a68ea 100644 --- a/tools/binman/etype/null.py +++ b/tools/binmanu/etype/null.py @@ -3,7 +3,7 @@ # Written by Simon Glass sjg@chromium.org #

-from binman.entry import Entry +from binmanu.entry import Entry from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/opensbi.py b/tools/binmanu/etype/opensbi.py similarity index 91% rename from tools/binman/etype/opensbi.py rename to tools/binmanu/etype/opensbi.py index 74d473d535a..4a6f1f11185 100644 --- a/tools/binman/etype/opensbi.py +++ b/tools/binmanu/etype/opensbi.py @@ -5,7 +5,7 @@ # Entry-type module for RISC-V OpenSBI binary blob #

-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg +from binmanu.etype.blob_named_by_arg import Entry_blob_named_by_arg

class Entry_opensbi(Entry_blob_named_by_arg): """RISC-V OpenSBI fw_dynamic blob diff --git a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py b/tools/binmanu/etype/powerpc_mpc85xx_bootpg_resetvec.py similarity index 94% rename from tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py rename to tools/binmanu/etype/powerpc_mpc85xx_bootpg_resetvec.py index 3a92fa399fb..70297cd672b 100644 --- a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py +++ b/tools/binmanu/etype/powerpc_mpc85xx_bootpg_resetvec.py @@ -4,7 +4,7 @@ # Entry-type module for the PowerPC mpc85xx bootpg and resetvec code for U-Boot #

-from binman.etype.blob import Entry_blob +from binmanu.etype.blob import Entry_blob

class Entry_powerpc_mpc85xx_bootpg_resetvec(Entry_blob): """PowerPC mpc85xx bootpg + resetvec code for U-Boot diff --git a/tools/binman/etype/pre_load.py b/tools/binmanu/etype/pre_load.py similarity index 97% rename from tools/binman/etype/pre_load.py rename to tools/binmanu/etype/pre_load.py index bd3545bffc0..b61b2030eee 100644 --- a/tools/binman/etype/pre_load.py +++ b/tools/binmanu/etype/pre_load.py @@ -10,9 +10,9 @@ import struct from dtoc import fdt_util from u_boot_pylib import tools

-from binman.entry import Entry -from binman.etype.collection import Entry_collection -from binman.entry import EntryArg +from binmanu.entry import Entry +from binmanu.etype.collection import Entry_collection +from binmanu.entry import EntryArg

from Cryptodome.Hash import SHA256, SHA384, SHA512 from Cryptodome.PublicKey import RSA diff --git a/tools/binman/etype/scp.py b/tools/binmanu/etype/scp.py similarity index 89% rename from tools/binman/etype/scp.py rename to tools/binmanu/etype/scp.py index a9bee3ce8bc..5f7bd818dab 100644 --- a/tools/binman/etype/scp.py +++ b/tools/binmanu/etype/scp.py @@ -4,7 +4,7 @@ # Entry-type module for System Control Processor (SCP) firmware blob #

-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg +from binmanu.etype.blob_named_by_arg import Entry_blob_named_by_arg

class Entry_scp(Entry_blob_named_by_arg): """System Control Processor (SCP) firmware blob diff --git a/tools/binman/etype/section.py b/tools/binmanu/etype/section.py similarity index 99% rename from tools/binman/etype/section.py rename to tools/binmanu/etype/section.py index 1f0bbd7f2ce..753ff73376b 100644 --- a/tools/binman/etype/section.py +++ b/tools/binmanu/etype/section.py @@ -13,8 +13,8 @@ import concurrent.futures import re import sys

-from binman.entry import Entry -from binman import state +from binmanu.entry import Entry +from binmanu import state from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib import tout diff --git a/tools/binman/etype/tee_os.py b/tools/binmanu/etype/tee_os.py similarity index 97% rename from tools/binman/etype/tee_os.py rename to tools/binmanu/etype/tee_os.py index 5529727e833..e9f576a1a2f 100644 --- a/tools/binman/etype/tee_os.py +++ b/tools/binmanu/etype/tee_os.py @@ -6,8 +6,8 @@

import struct

-from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg -from binman import elf +from binmanu.etype.blob_named_by_arg import Entry_blob_named_by_arg +from binmanu import elf

class Entry_tee_os(Entry_blob_named_by_arg): """Entry containing an OP-TEE Trusted OS (TEE) blob diff --git a/tools/binman/etype/text.py b/tools/binmanu/etype/text.py similarity index 98% rename from tools/binman/etype/text.py rename to tools/binmanu/etype/text.py index e4deb4abacc..bbc8a7b5777 100644 --- a/tools/binman/etype/text.py +++ b/tools/binmanu/etype/text.py @@ -5,7 +5,7 @@

from collections import OrderedDict

-from binman.entry import Entry, EntryArg +from binmanu.entry import Entry, EntryArg from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/u_boot.py b/tools/binmanu/etype/u_boot.py similarity index 92% rename from tools/binman/etype/u_boot.py rename to tools/binmanu/etype/u_boot.py index d5639eef2e4..12c330e65c0 100644 --- a/tools/binman/etype/u_boot.py +++ b/tools/binmanu/etype/u_boot.py @@ -5,8 +5,8 @@ # Entry-type module for the expanded U-Boot binary #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot(Entry_blob): """U-Boot flat binary diff --git a/tools/binman/etype/u_boot_dtb.py b/tools/binmanu/etype/u_boot_dtb.py similarity index 91% rename from tools/binman/etype/u_boot_dtb.py rename to tools/binmanu/etype/u_boot_dtb.py index 65e71291d27..93324ec9894 100644 --- a/tools/binman/etype/u_boot_dtb.py +++ b/tools/binmanu/etype/u_boot_dtb.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree #

-from binman.entry import Entry -from binman.etype.blob_dtb import Entry_blob_dtb +from binmanu.entry import Entry +from binmanu.etype.blob_dtb import Entry_blob_dtb

class Entry_u_boot_dtb(Entry_blob_dtb): """U-Boot device tree diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binmanu/etype/u_boot_dtb_with_ucode.py similarity index 96% rename from tools/binman/etype/u_boot_dtb_with_ucode.py rename to tools/binmanu/etype/u_boot_dtb_with_ucode.py index f7225cecc16..49e0288811a 100644 --- a/tools/binman/etype/u_boot_dtb_with_ucode.py +++ b/tools/binmanu/etype/u_boot_dtb_with_ucode.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree with the microcode removed #

-from binman.entry import Entry -from binman.etype.blob_dtb import Entry_blob_dtb +from binmanu.entry import Entry +from binmanu.etype.blob_dtb import Entry_blob_dtb from u_boot_pylib import tools

# This is imported if needed @@ -29,7 +29,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb): def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt global state - from binman import state + from binmanu import state

super().__init__(section, etype, node) self.ucode_data = b'' diff --git a/tools/binman/etype/u_boot_elf.py b/tools/binmanu/etype/u_boot_elf.py similarity index 93% rename from tools/binman/etype/u_boot_elf.py rename to tools/binmanu/etype/u_boot_elf.py index f4d86aa176a..621577021f2 100644 --- a/tools/binman/etype/u_boot_elf.py +++ b/tools/binmanu/etype/u_boot_elf.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot ELF image #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

from dtoc import fdt_util from u_boot_pylib import tools diff --git a/tools/binman/etype/u_boot_env.py b/tools/binmanu/etype/u_boot_env.py similarity index 96% rename from tools/binman/etype/u_boot_env.py rename to tools/binmanu/etype/u_boot_env.py index c027e93d42c..9603e9eb3b6 100644 --- a/tools/binman/etype/u_boot_env.py +++ b/tools/binmanu/etype/u_boot_env.py @@ -6,7 +6,7 @@ import struct import zlib

-from binman.etype.blob import Entry_blob +from binmanu.etype.blob import Entry_blob from dtoc import fdt_util from u_boot_pylib import tools

diff --git a/tools/binman/etype/u_boot_expanded.py b/tools/binmanu/etype/u_boot_expanded.py similarity index 93% rename from tools/binman/etype/u_boot_expanded.py rename to tools/binmanu/etype/u_boot_expanded.py index 8797824c9f0..457f867aa82 100644 --- a/tools/binman/etype/u_boot_expanded.py +++ b/tools/binmanu/etype/u_boot_expanded.py @@ -5,7 +5,7 @@ # Entry-type module for U-Boot binary #

-from binman.etype.blob_phase import Entry_blob_phase +from binmanu.etype.blob_phase import Entry_blob_phase

class Entry_u_boot_expanded(Entry_blob_phase): """U-Boot flat binary broken out into its component parts diff --git a/tools/binman/etype/u_boot_img.py b/tools/binmanu/etype/u_boot_img.py similarity index 90% rename from tools/binman/etype/u_boot_img.py rename to tools/binmanu/etype/u_boot_img.py index 8a739d8edb6..ccc939e1904 100644 --- a/tools/binman/etype/u_boot_img.py +++ b/tools/binmanu/etype/u_boot_img.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot binary #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_img(Entry_blob): """U-Boot legacy image diff --git a/tools/binman/etype/u_boot_nodtb.py b/tools/binmanu/etype/u_boot_nodtb.py similarity index 92% rename from tools/binman/etype/u_boot_nodtb.py rename to tools/binmanu/etype/u_boot_nodtb.py index 347ba7dc697..8efd8e9275c 100644 --- a/tools/binman/etype/u_boot_nodtb.py +++ b/tools/binmanu/etype/u_boot_nodtb.py @@ -5,8 +5,8 @@ # Entry-type module for 'u-boot-nodtb.bin' #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_nodtb(Entry_blob): """U-Boot flat binary without device tree appended diff --git a/tools/binman/etype/u_boot_spl.py b/tools/binmanu/etype/u_boot_spl.py similarity index 95% rename from tools/binman/etype/u_boot_spl.py rename to tools/binmanu/etype/u_boot_spl.py index 7f710c857db..e00c9f69288 100644 --- a/tools/binman/etype/u_boot_spl.py +++ b/tools/binmanu/etype/u_boot_spl.py @@ -5,8 +5,8 @@ # Entry-type module for spl/u-boot-spl.bin #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_spl(Entry_blob): """U-Boot SPL binary diff --git a/tools/binman/etype/u_boot_spl_bss_pad.py b/tools/binmanu/etype/u_boot_spl_bss_pad.py similarity index 94% rename from tools/binman/etype/u_boot_spl_bss_pad.py rename to tools/binmanu/etype/u_boot_spl_bss_pad.py index 1ffeb3911fd..0912aab08ef 100644 --- a/tools/binman/etype/u_boot_spl_bss_pad.py +++ b/tools/binmanu/etype/u_boot_spl_bss_pad.py @@ -7,9 +7,9 @@ # to it will appear to SPL to be at the end of BSS rather than the start. #

-from binman import elf -from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu import elf +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from u_boot_pylib import tools

class Entry_u_boot_spl_bss_pad(Entry_blob): diff --git a/tools/binman/etype/u_boot_spl_dtb.py b/tools/binmanu/etype/u_boot_spl_dtb.py similarity index 90% rename from tools/binman/etype/u_boot_spl_dtb.py rename to tools/binmanu/etype/u_boot_spl_dtb.py index eefc4a44aab..7431977f2b4 100644 --- a/tools/binman/etype/u_boot_spl_dtb.py +++ b/tools/binmanu/etype/u_boot_spl_dtb.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree in SPL (Secondary Program Loader) #

-from binman.entry import Entry -from binman.etype.blob_dtb import Entry_blob_dtb +from binmanu.entry import Entry +from binmanu.etype.blob_dtb import Entry_blob_dtb

class Entry_u_boot_spl_dtb(Entry_blob_dtb): """U-Boot SPL device tree diff --git a/tools/binman/etype/u_boot_spl_elf.py b/tools/binmanu/etype/u_boot_spl_elf.py similarity index 90% rename from tools/binman/etype/u_boot_spl_elf.py rename to tools/binmanu/etype/u_boot_spl_elf.py index 7b7b4e01495..949141c3f09 100644 --- a/tools/binman/etype/u_boot_spl_elf.py +++ b/tools/binmanu/etype/u_boot_spl_elf.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot SPL ELF image #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_spl_elf(Entry_blob): """U-Boot SPL ELF image diff --git a/tools/binman/etype/u_boot_spl_expanded.py b/tools/binmanu/etype/u_boot_spl_expanded.py similarity index 95% rename from tools/binman/etype/u_boot_spl_expanded.py rename to tools/binmanu/etype/u_boot_spl_expanded.py index fcd0dd19ac4..da3b5fdb05b 100644 --- a/tools/binman/etype/u_boot_spl_expanded.py +++ b/tools/binmanu/etype/u_boot_spl_expanded.py @@ -7,8 +7,8 @@

from u_boot_pylib import tout

-from binman import state -from binman.etype.blob_phase import Entry_blob_phase +from binmanu import state +from binmanu.etype.blob_phase import Entry_blob_phase

class Entry_u_boot_spl_expanded(Entry_blob_phase): """U-Boot SPL flat binary broken out into its component parts diff --git a/tools/binman/etype/u_boot_spl_nodtb.py b/tools/binmanu/etype/u_boot_spl_nodtb.py similarity index 94% rename from tools/binman/etype/u_boot_spl_nodtb.py rename to tools/binmanu/etype/u_boot_spl_nodtb.py index e7ec329c902..b9bc0f50c18 100644 --- a/tools/binman/etype/u_boot_spl_nodtb.py +++ b/tools/binmanu/etype/u_boot_spl_nodtb.py @@ -5,8 +5,8 @@ # Entry-type module for 'u-boot-spl-nodtb.bin' #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_spl_nodtb(Entry_blob): """SPL binary without device tree appended diff --git a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py b/tools/binmanu/etype/u_boot_spl_with_ucode_ptr.py similarity index 90% rename from tools/binman/etype/u_boot_spl_with_ucode_ptr.py rename to tools/binmanu/etype/u_boot_spl_with_ucode_ptr.py index 72739a5eb67..8842797de81 100644 --- a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py +++ b/tools/binmanu/etype/u_boot_spl_with_ucode_ptr.py @@ -7,7 +7,7 @@

import struct

-from binman.etype.u_boot_with_ucode_ptr import Entry_u_boot_with_ucode_ptr +from binmanu.etype.u_boot_with_ucode_ptr import Entry_u_boot_with_ucode_ptr

class Entry_u_boot_spl_with_ucode_ptr(Entry_u_boot_with_ucode_ptr): """U-Boot SPL with embedded microcode pointer diff --git a/tools/binman/etype/u_boot_tpl.py b/tools/binmanu/etype/u_boot_tpl.py similarity index 95% rename from tools/binman/etype/u_boot_tpl.py rename to tools/binmanu/etype/u_boot_tpl.py index 397b9f89531..7e198167e2e 100644 --- a/tools/binman/etype/u_boot_tpl.py +++ b/tools/binmanu/etype/u_boot_tpl.py @@ -5,8 +5,8 @@ # Entry-type module for tpl/u-boot-tpl.bin #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_tpl(Entry_blob): """U-Boot TPL binary diff --git a/tools/binman/etype/u_boot_tpl_bss_pad.py b/tools/binmanu/etype/u_boot_tpl_bss_pad.py similarity index 94% rename from tools/binman/etype/u_boot_tpl_bss_pad.py rename to tools/binmanu/etype/u_boot_tpl_bss_pad.py index 29c6a954129..36fd7cce7c3 100644 --- a/tools/binman/etype/u_boot_tpl_bss_pad.py +++ b/tools/binmanu/etype/u_boot_tpl_bss_pad.py @@ -7,9 +7,9 @@ # to it will appear to TPL to be at the end of BSS rather than the start. #

-from binman import elf -from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu import elf +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from u_boot_pylib import tools

class Entry_u_boot_tpl_bss_pad(Entry_blob): diff --git a/tools/binman/etype/u_boot_tpl_dtb.py b/tools/binmanu/etype/u_boot_tpl_dtb.py similarity index 90% rename from tools/binman/etype/u_boot_tpl_dtb.py rename to tools/binmanu/etype/u_boot_tpl_dtb.py index 2ff1d7ced1a..a13049def1c 100644 --- a/tools/binman/etype/u_boot_tpl_dtb.py +++ b/tools/binmanu/etype/u_boot_tpl_dtb.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree in TPL (Tertiary Program Loader) #

-from binman.entry import Entry -from binman.etype.blob_dtb import Entry_blob_dtb +from binmanu.entry import Entry +from binmanu.etype.blob_dtb import Entry_blob_dtb

class Entry_u_boot_tpl_dtb(Entry_blob_dtb): """U-Boot TPL device tree diff --git a/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py b/tools/binmanu/etype/u_boot_tpl_dtb_with_ucode.py similarity index 90% rename from tools/binman/etype/u_boot_tpl_dtb_with_ucode.py rename to tools/binmanu/etype/u_boot_tpl_dtb_with_ucode.py index 066f18dfef2..b8a133de60e 100644 --- a/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py +++ b/tools/binmanu/etype/u_boot_tpl_dtb_with_ucode.py @@ -5,7 +5,7 @@ # Entry-type module for U-Boot device tree with the microcode removed #

-from binman.etype.u_boot_dtb_with_ucode import Entry_u_boot_dtb_with_ucode +from binmanu.etype.u_boot_dtb_with_ucode import Entry_u_boot_dtb_with_ucode

class Entry_u_boot_tpl_dtb_with_ucode(Entry_u_boot_dtb_with_ucode): """U-Boot TPL with embedded microcode pointer diff --git a/tools/binman/etype/u_boot_tpl_elf.py b/tools/binmanu/etype/u_boot_tpl_elf.py similarity index 90% rename from tools/binman/etype/u_boot_tpl_elf.py rename to tools/binmanu/etype/u_boot_tpl_elf.py index fd100019b39..1cdb653ac87 100644 --- a/tools/binman/etype/u_boot_tpl_elf.py +++ b/tools/binmanu/etype/u_boot_tpl_elf.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot TPL ELF image #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_tpl_elf(Entry_blob): """U-Boot TPL ELF image diff --git a/tools/binman/etype/u_boot_tpl_expanded.py b/tools/binmanu/etype/u_boot_tpl_expanded.py similarity index 95% rename from tools/binman/etype/u_boot_tpl_expanded.py rename to tools/binmanu/etype/u_boot_tpl_expanded.py index 58db4f37556..3b968a2f3eb 100644 --- a/tools/binman/etype/u_boot_tpl_expanded.py +++ b/tools/binmanu/etype/u_boot_tpl_expanded.py @@ -7,8 +7,8 @@

from u_boot_pylib import tout

-from binman import state -from binman.etype.blob_phase import Entry_blob_phase +from binmanu import state +from binmanu.etype.blob_phase import Entry_blob_phase

class Entry_u_boot_tpl_expanded(Entry_blob_phase): """U-Boot TPL flat binary broken out into its component parts diff --git a/tools/binman/etype/u_boot_tpl_nodtb.py b/tools/binmanu/etype/u_boot_tpl_nodtb.py similarity index 94% rename from tools/binman/etype/u_boot_tpl_nodtb.py rename to tools/binmanu/etype/u_boot_tpl_nodtb.py index 9bb2b5dda30..b58a4176b7f 100644 --- a/tools/binman/etype/u_boot_tpl_nodtb.py +++ b/tools/binmanu/etype/u_boot_tpl_nodtb.py @@ -5,8 +5,8 @@ # Entry-type module for 'u-boot-tpl-nodtb.bin' #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_tpl_nodtb(Entry_blob): """TPL binary without device tree appended diff --git a/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py b/tools/binmanu/etype/u_boot_tpl_with_ucode_ptr.py similarity index 82% rename from tools/binman/etype/u_boot_tpl_with_ucode_ptr.py rename to tools/binmanu/etype/u_boot_tpl_with_ucode_ptr.py index 86f9578b714..296c2ecb056 100644 --- a/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py +++ b/tools/binmanu/etype/u_boot_tpl_with_ucode_ptr.py @@ -7,9 +7,9 @@

import struct

-from binman.entry import Entry -from binman.etype.blob import Entry_blob -from binman.etype.u_boot_with_ucode_ptr import Entry_u_boot_with_ucode_ptr +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob +from binmanu.etype.u_boot_with_ucode_ptr import Entry_u_boot_with_ucode_ptr from u_boot_pylib import command from u_boot_pylib import tools

diff --git a/tools/binman/etype/u_boot_ucode.py b/tools/binmanu/etype/u_boot_ucode.py similarity index 98% rename from tools/binman/etype/u_boot_ucode.py rename to tools/binmanu/etype/u_boot_ucode.py index 97ed7d7eb14..b329e5355dd 100644 --- a/tools/binman/etype/u_boot_ucode.py +++ b/tools/binmanu/etype/u_boot_ucode.py @@ -5,8 +5,8 @@ # Entry-type module for a U-Boot binary with an embedded microcode pointer #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from u_boot_pylib import tools

class Entry_u_boot_ucode(Entry_blob): diff --git a/tools/binman/etype/u_boot_vpl.py b/tools/binmanu/etype/u_boot_vpl.py similarity index 94% rename from tools/binman/etype/u_boot_vpl.py rename to tools/binmanu/etype/u_boot_vpl.py index 31d7e8374e2..70c04b6c4c1 100644 --- a/tools/binman/etype/u_boot_vpl.py +++ b/tools/binmanu/etype/u_boot_vpl.py @@ -5,8 +5,8 @@ # Entry-type module for vpl/u-boot-vpl.bin #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_vpl(Entry_blob): """U-Boot VPL binary diff --git a/tools/binman/etype/u_boot_vpl_bss_pad.py b/tools/binmanu/etype/u_boot_vpl_bss_pad.py similarity index 94% rename from tools/binman/etype/u_boot_vpl_bss_pad.py rename to tools/binmanu/etype/u_boot_vpl_bss_pad.py index bba38ccf9e9..7d8b7f5d721 100644 --- a/tools/binman/etype/u_boot_vpl_bss_pad.py +++ b/tools/binmanu/etype/u_boot_vpl_bss_pad.py @@ -7,9 +7,9 @@ # to it will appear to VPL to be at the end of BSS rather than the start. #

-from binman import elf -from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu import elf +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from u_boot_pylib import tools

class Entry_u_boot_vpl_bss_pad(Entry_blob): diff --git a/tools/binman/etype/u_boot_vpl_dtb.py b/tools/binmanu/etype/u_boot_vpl_dtb.py similarity index 90% rename from tools/binman/etype/u_boot_vpl_dtb.py rename to tools/binmanu/etype/u_boot_vpl_dtb.py index f6253bf2431..e6e3c7de770 100644 --- a/tools/binman/etype/u_boot_vpl_dtb.py +++ b/tools/binmanu/etype/u_boot_vpl_dtb.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot device tree in VPL (Verifying Program Loader) #

-from binman.entry import Entry -from binman.etype.blob_dtb import Entry_blob_dtb +from binmanu.entry import Entry +from binmanu.etype.blob_dtb import Entry_blob_dtb

class Entry_u_boot_vpl_dtb(Entry_blob_dtb): """U-Boot VPL device tree diff --git a/tools/binman/etype/u_boot_vpl_elf.py b/tools/binmanu/etype/u_boot_vpl_elf.py similarity index 90% rename from tools/binman/etype/u_boot_vpl_elf.py rename to tools/binmanu/etype/u_boot_vpl_elf.py index 2c686790194..0cf499bafc5 100644 --- a/tools/binman/etype/u_boot_vpl_elf.py +++ b/tools/binmanu/etype/u_boot_vpl_elf.py @@ -5,8 +5,8 @@ # Entry-type module for U-Boot VPL ELF image #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_vpl_elf(Entry_blob): """U-Boot VPL ELF image diff --git a/tools/binman/etype/u_boot_vpl_expanded.py b/tools/binmanu/etype/u_boot_vpl_expanded.py similarity index 95% rename from tools/binman/etype/u_boot_vpl_expanded.py rename to tools/binmanu/etype/u_boot_vpl_expanded.py index deff5a3f8c2..35a54c0bbd6 100644 --- a/tools/binman/etype/u_boot_vpl_expanded.py +++ b/tools/binmanu/etype/u_boot_vpl_expanded.py @@ -7,8 +7,8 @@

from u_boot_pylib import tout

-from binman import state -from binman.etype.blob_phase import Entry_blob_phase +from binmanu import state +from binmanu.etype.blob_phase import Entry_blob_phase

class Entry_u_boot_vpl_expanded(Entry_blob_phase): """U-Boot VPL flat binary broken out into its component parts diff --git a/tools/binman/etype/u_boot_vpl_nodtb.py b/tools/binmanu/etype/u_boot_vpl_nodtb.py similarity index 94% rename from tools/binman/etype/u_boot_vpl_nodtb.py rename to tools/binmanu/etype/u_boot_vpl_nodtb.py index 64c2767488d..399df91ebf7 100644 --- a/tools/binman/etype/u_boot_vpl_nodtb.py +++ b/tools/binmanu/etype/u_boot_vpl_nodtb.py @@ -5,8 +5,8 @@ # Entry-type module for 'u-boot-vpl-nodtb.bin' #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_u_boot_vpl_nodtb(Entry_blob): """VPL binary without device tree appended diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binmanu/etype/u_boot_with_ucode_ptr.py similarity index 97% rename from tools/binman/etype/u_boot_with_ucode_ptr.py rename to tools/binmanu/etype/u_boot_with_ucode_ptr.py index 41731fd0e13..d56c2b91871 100644 --- a/tools/binman/etype/u_boot_with_ucode_ptr.py +++ b/tools/binmanu/etype/u_boot_with_ucode_ptr.py @@ -7,9 +7,9 @@

import struct

-from binman import elf -from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu import elf +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob from dtoc import fdt_util from u_boot_pylib import tools from u_boot_pylib import command diff --git a/tools/binman/etype/vblock.py b/tools/binmanu/etype/vblock.py similarity index 97% rename from tools/binman/etype/vblock.py rename to tools/binmanu/etype/vblock.py index 4adb9a4e9bf..4781d98279c 100644 --- a/tools/binman/etype/vblock.py +++ b/tools/binmanu/etype/vblock.py @@ -9,8 +9,8 @@ from collections import OrderedDict import os

-from binman.entry import EntryArg -from binman.etype.collection import Entry_collection +from binmanu.entry import EntryArg +from binmanu.etype.collection import Entry_collection

from dtoc import fdt_util from u_boot_pylib import tools diff --git a/tools/binman/etype/x86_reset16.py b/tools/binmanu/etype/x86_reset16.py similarity index 92% rename from tools/binman/etype/x86_reset16.py rename to tools/binmanu/etype/x86_reset16.py index 5d49f16e21c..8d73c97c1ea 100644 --- a/tools/binman/etype/x86_reset16.py +++ b/tools/binmanu/etype/x86_reset16.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 reset code for U-Boot #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_reset16(Entry_blob): """x86 16-bit reset code for U-Boot diff --git a/tools/binman/etype/x86_reset16_spl.py b/tools/binmanu/etype/x86_reset16_spl.py similarity index 92% rename from tools/binman/etype/x86_reset16_spl.py rename to tools/binmanu/etype/x86_reset16_spl.py index 775b90699ba..907273533bb 100644 --- a/tools/binman/etype/x86_reset16_spl.py +++ b/tools/binmanu/etype/x86_reset16_spl.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 reset code for U-Boot #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_reset16_spl(Entry_blob): """x86 16-bit reset code for U-Boot diff --git a/tools/binman/etype/x86_reset16_tpl.py b/tools/binmanu/etype/x86_reset16_tpl.py similarity index 92% rename from tools/binman/etype/x86_reset16_tpl.py rename to tools/binmanu/etype/x86_reset16_tpl.py index 52d3f4869ae..623e2f85198 100644 --- a/tools/binman/etype/x86_reset16_tpl.py +++ b/tools/binmanu/etype/x86_reset16_tpl.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 reset code for U-Boot #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_reset16_tpl(Entry_blob): """x86 16-bit reset code for U-Boot diff --git a/tools/binman/etype/x86_start16.py b/tools/binmanu/etype/x86_start16.py similarity index 93% rename from tools/binman/etype/x86_start16.py rename to tools/binmanu/etype/x86_start16.py index 18fdd95d370..201f01cc39b 100644 --- a/tools/binman/etype/x86_start16.py +++ b/tools/binmanu/etype/x86_start16.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 start-up code for U-Boot #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_start16(Entry_blob): """x86 16-bit start-up code for U-Boot diff --git a/tools/binman/etype/x86_start16_spl.py b/tools/binmanu/etype/x86_start16_spl.py similarity index 93% rename from tools/binman/etype/x86_start16_spl.py rename to tools/binmanu/etype/x86_start16_spl.py index ac8e90f2e0c..856183872f1 100644 --- a/tools/binman/etype/x86_start16_spl.py +++ b/tools/binmanu/etype/x86_start16_spl.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 start-up code for U-Boot SPL #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_start16_spl(Entry_blob): """x86 16-bit start-up code for SPL diff --git a/tools/binman/etype/x86_start16_tpl.py b/tools/binmanu/etype/x86_start16_tpl.py similarity index 93% rename from tools/binman/etype/x86_start16_tpl.py rename to tools/binmanu/etype/x86_start16_tpl.py index 72d4608bb73..1d506208a66 100644 --- a/tools/binman/etype/x86_start16_tpl.py +++ b/tools/binmanu/etype/x86_start16_tpl.py @@ -5,8 +5,8 @@ # Entry-type module for the 16-bit x86 start-up code for U-Boot TPL #

-from binman.entry import Entry -from binman.etype.blob import Entry_blob +from binmanu.entry import Entry +from binmanu.etype.blob import Entry_blob

class Entry_x86_start16_tpl(Entry_blob): """x86 16-bit start-up code for TPL diff --git a/tools/binman/fdt_test.py b/tools/binmanu/fdt_test.py similarity index 100% rename from tools/binman/fdt_test.py rename to tools/binmanu/fdt_test.py diff --git a/tools/binman/fip_util.py b/tools/binmanu/fip_util.py similarity index 100% rename from tools/binman/fip_util.py rename to tools/binmanu/fip_util.py diff --git a/tools/binman/fip_util_test.py b/tools/binmanu/fip_util_test.py similarity index 99% rename from tools/binman/fip_util_test.py rename to tools/binmanu/fip_util_test.py index 56aa56f4643..caa2049f6cb 100755 --- a/tools/binman/fip_util_test.py +++ b/tools/binmanu/fip_util_test.py @@ -20,8 +20,8 @@ OUR_PATH = os.path.dirname(os.path.realpath(__file__)) sys.path.insert(2, os.path.join(OUR_PATH, '..'))

# pylint: disable=C0413 -from binman import bintool -from binman import fip_util +from binmanu import bintool +from binmanu import fip_util from u_boot_pylib import test_util from u_boot_pylib import tools

diff --git a/tools/binman/fmap_util.py b/tools/binmanu/fmap_util.py similarity index 100% rename from tools/binman/fmap_util.py rename to tools/binmanu/fmap_util.py diff --git a/tools/binman/ftest.py b/tools/binmanu/ftest.py similarity index 99% rename from tools/binman/ftest.py rename to tools/binmanu/ftest.py index 3cb17b6dec8..6412200fe66 100644 --- a/tools/binman/ftest.py +++ b/tools/binmanu/ftest.py @@ -20,20 +20,20 @@ import unittest import unittest.mock import urllib.error

-from binman import bintool -from binman import cbfs_util -from binman import cmdline -from binman import control -from binman import elf -from binman import elf_test -from binman import fip_util -from binman import fmap_util -from binman import state +from binmanu import bintool +from binmanu import cbfs_util +from binmanu import cmdline +from binmanu import control +from binmanu import elf +from binmanu import elf_test +from binmanu import fip_util +from binmanu import fmap_util +from binmanu import state from dtoc import fdt from dtoc import fdt_util -from binman.etype import fdtmap -from binman.etype import image_header -from binman.image import Image +from binmanu.etype import fdtmap +from binmanu.etype import image_header +from binmanu.image import Image from u_boot_pylib import command from u_boot_pylib import test_util from u_boot_pylib import tools @@ -131,7 +131,7 @@ class TestFunctional(unittest.TestCase): @classmethod def setUpClass(cls): global entry - from binman import entry + from binmanu import entry

# Handle the case where argv[0] is 'python' cls._binman_dir = os.path.dirname(os.path.realpath(sys.argv[0])) @@ -296,7 +296,7 @@ class TestFunctional(unittest.TestCase): New image filename """ image_fname = tools.get_output_filename('image.bin') - tmpdir = tempfile.mkdtemp(prefix='binman.') + tmpdir = tempfile.mkdtemp(prefix='binmanu.') updated_fname = os.path.join(tmpdir, 'image-updated.bin') tools.write_file(updated_fname, tools.read_file(image_fname)) self._CleanupOutputDir() @@ -1529,7 +1529,7 @@ class TestFunctional(unittest.TestCase): self._DoReadFile('057_unknown_contents.dts', True) self.assertIn("Image '/binman': Internal error: Could not complete " "processing of contents: remaining [" - "<binman.etype._testing.Entry__testing ", str(e.exception)) + "<binmanu.etype._testing.Entry__testing ", str(e.exception))

def testBadChangeSize(self): """Test that trying to change the size of an entry fails""" @@ -1576,7 +1576,7 @@ class TestFunctional(unittest.TestCase): with self.assertRaises(ValueError) as e: self._DoReadFileDtb('061_fdt_update_bad.dts', update_dtb=True) self.assertIn('Could not complete processing of Fdt: remaining ' - '[<binman.etype._testing.Entry__testing', + '[<binmanu.etype._testing.Entry__testing', str(e.exception))

def testEntryArgs(self): diff --git a/tools/binman/image.py b/tools/binmanu/image.py similarity index 99% rename from tools/binman/image.py rename to tools/binmanu/image.py index 8ebf71d61a8..3e3070ed4b2 100644 --- a/tools/binman/image.py +++ b/tools/binmanu/image.py @@ -12,10 +12,10 @@ import os import re import sys

-from binman.entry import Entry -from binman.etype import fdtmap -from binman.etype import image_header -from binman.etype import section +from binmanu.entry import Entry +from binmanu.etype import fdtmap +from binmanu.etype import image_header +from binmanu.etype import section from dtoc import fdt from dtoc import fdt_util from u_boot_pylib import tools diff --git a/tools/binman/image_test.py b/tools/binmanu/image_test.py similarity index 98% rename from tools/binman/image_test.py rename to tools/binmanu/image_test.py index bd51c1e55d1..caaf53aacf5 100644 --- a/tools/binman/image_test.py +++ b/tools/binmanu/image_test.py @@ -6,7 +6,7 @@

import unittest

-from binman.image import Image +from binmanu.image import Image from u_boot_pylib.test_util import capture_sys_output

class TestImage(unittest.TestCase): diff --git a/tools/binman/index.rst b/tools/binmanu/index.rst similarity index 100% rename from tools/binman/index.rst rename to tools/binmanu/index.rst diff --git a/tools/binman/main.py b/tools/binmanu/main.py similarity index 88% rename from tools/binman/main.py rename to tools/binmanu/main.py index eef17b7b55f..813343f2fda 100755 --- a/tools/binman/main.py +++ b/tools/binmanu/main.py @@ -33,7 +33,7 @@ sys.pycache_prefix = os.path.relpath(our_path, srctree) # in PYTHONPATH) sys.path.insert(2, our1_path)

-from binman import bintool +from binmanu import bintool from u_boot_pylib import test_util

# Bring in the libfdt module @@ -42,8 +42,8 @@ sys.path.insert(2, os.path.join(srctree, 'scripts/dtc/pylibfdt')) sys.path.insert(2, os.path.join(srctree, 'build-sandbox/scripts/dtc/pylibfdt')) sys.path.insert(2, os.path.join(srctree, 'build-sandbox_spl/scripts/dtc/pylibfdt'))

-from binman import cmdline -from binman import control +from binmanu import cmdline +from binmanu import control from u_boot_pylib import test_util

def RunTests(debug, verbosity, processes, test_preserve_dirs, args, toolpath): @@ -62,14 +62,14 @@ def RunTests(debug, verbosity, processes, test_preserve_dirs, args, toolpath): name to execute (as in 'binman test testSections', for example) toolpath: List of paths to use for tools """ - from binman import bintool_test - from binman import cbfs_util_test - from binman import elf_test - from binman import entry_test - from binman import fdt_test - from binman import fip_util_test - from binman import ftest - from binman import image_test + from binmanu import bintool_test + from binmanu import cbfs_util_test + from binmanu import elf_test + from binmanu import entry_test + from binmanu import fdt_test + from binmanu import fip_util_test + from binmanu import ftest + from binmanu import image_test import doctest

test_name = args and args[0] or None @@ -85,7 +85,7 @@ def RunTests(debug, verbosity, processes, test_preserve_dirs, args, toolpath):

return (0 if result.wasSuccessful() else 1)

-def RunTestCoverage(toolpath): +def RunTestCoverage(toolpath, build_dir): """Run the tests and check that we get 100% coverage""" glob_list = control.GetEntryModules(False) all_set = set([os.path.splitext(os.path.basename(item))[0] @@ -94,10 +94,10 @@ def RunTestCoverage(toolpath): if toolpath: for path in toolpath: extra_args += ' --toolpath %s' % path - test_util.run_test_coverage('tools/binman/binman', None, + test_util.run_test_coverage('tools/binmanu/binman', None, ['*test*', '*main.py', 'tools/patman/*', 'tools/dtoc/*', 'tools/u_boot_pylib/*'], - args.build_dir, all_set, extra_args or None) + build_dir, all_set, extra_args or None)

def RunBinman(args): """Main entry point to binman once arguments are parsed @@ -117,7 +117,7 @@ def RunBinman(args):

if args.cmd == 'test': if args.test_coverage: - RunTestCoverage(args.toolpath) + RunTestCoverage(args.toolpath, args.build_dir) else: ret_code = RunTests(args.debug, args.verbosity, args.processes, args.test_preserve_dirs, args.tests, diff --git a/tools/binman/missing-blob-help b/tools/binmanu/missing-blob-help similarity index 100% rename from tools/binman/missing-blob-help rename to tools/binmanu/missing-blob-help diff --git a/tools/binman/setup.py b/tools/binmanu/setup.py similarity index 100% rename from tools/binman/setup.py rename to tools/binmanu/setup.py diff --git a/tools/binman/state.py b/tools/binmanu/state.py similarity index 100% rename from tools/binman/state.py rename to tools/binmanu/state.py diff --git a/tools/binman/test/001_invalid.dts b/tools/binmanu/test/001_invalid.dts similarity index 100% rename from tools/binman/test/001_invalid.dts rename to tools/binmanu/test/001_invalid.dts diff --git a/tools/binman/test/002_missing_node.dts b/tools/binmanu/test/002_missing_node.dts similarity index 100% rename from tools/binman/test/002_missing_node.dts rename to tools/binmanu/test/002_missing_node.dts diff --git a/tools/binman/test/003_empty.dts b/tools/binmanu/test/003_empty.dts similarity index 100% rename from tools/binman/test/003_empty.dts rename to tools/binmanu/test/003_empty.dts diff --git a/tools/binman/test/004_invalid_entry.dts b/tools/binmanu/test/004_invalid_entry.dts similarity index 100% rename from tools/binman/test/004_invalid_entry.dts rename to tools/binmanu/test/004_invalid_entry.dts diff --git a/tools/binman/test/005_simple.dts b/tools/binmanu/test/005_simple.dts similarity index 100% rename from tools/binman/test/005_simple.dts rename to tools/binmanu/test/005_simple.dts diff --git a/tools/binman/test/006_dual_image.dts b/tools/binmanu/test/006_dual_image.dts similarity index 100% rename from tools/binman/test/006_dual_image.dts rename to tools/binmanu/test/006_dual_image.dts diff --git a/tools/binman/test/007_bad_align.dts b/tools/binmanu/test/007_bad_align.dts similarity index 100% rename from tools/binman/test/007_bad_align.dts rename to tools/binmanu/test/007_bad_align.dts diff --git a/tools/binman/test/008_pack.dts b/tools/binmanu/test/008_pack.dts similarity index 100% rename from tools/binman/test/008_pack.dts rename to tools/binmanu/test/008_pack.dts diff --git a/tools/binman/test/009_pack_extra.dts b/tools/binmanu/test/009_pack_extra.dts similarity index 100% rename from tools/binman/test/009_pack_extra.dts rename to tools/binmanu/test/009_pack_extra.dts diff --git a/tools/binman/test/010_pack_align_power2.dts b/tools/binmanu/test/010_pack_align_power2.dts similarity index 100% rename from tools/binman/test/010_pack_align_power2.dts rename to tools/binmanu/test/010_pack_align_power2.dts diff --git a/tools/binman/test/011_pack_align_size_power2.dts b/tools/binmanu/test/011_pack_align_size_power2.dts similarity index 100% rename from tools/binman/test/011_pack_align_size_power2.dts rename to tools/binmanu/test/011_pack_align_size_power2.dts diff --git a/tools/binman/test/012_pack_inv_align.dts b/tools/binmanu/test/012_pack_inv_align.dts similarity index 100% rename from tools/binman/test/012_pack_inv_align.dts rename to tools/binmanu/test/012_pack_inv_align.dts diff --git a/tools/binman/test/013_pack_inv_size_align.dts b/tools/binmanu/test/013_pack_inv_size_align.dts similarity index 100% rename from tools/binman/test/013_pack_inv_size_align.dts rename to tools/binmanu/test/013_pack_inv_size_align.dts diff --git a/tools/binman/test/014_pack_overlap.dts b/tools/binmanu/test/014_pack_overlap.dts similarity index 100% rename from tools/binman/test/014_pack_overlap.dts rename to tools/binmanu/test/014_pack_overlap.dts diff --git a/tools/binman/test/015_pack_overflow.dts b/tools/binmanu/test/015_pack_overflow.dts similarity index 100% rename from tools/binman/test/015_pack_overflow.dts rename to tools/binmanu/test/015_pack_overflow.dts diff --git a/tools/binman/test/016_pack_image_overflow.dts b/tools/binmanu/test/016_pack_image_overflow.dts similarity index 100% rename from tools/binman/test/016_pack_image_overflow.dts rename to tools/binmanu/test/016_pack_image_overflow.dts diff --git a/tools/binman/test/017_pack_image_size.dts b/tools/binmanu/test/017_pack_image_size.dts similarity index 100% rename from tools/binman/test/017_pack_image_size.dts rename to tools/binmanu/test/017_pack_image_size.dts diff --git a/tools/binman/test/018_pack_image_align.dts b/tools/binmanu/test/018_pack_image_align.dts similarity index 100% rename from tools/binman/test/018_pack_image_align.dts rename to tools/binmanu/test/018_pack_image_align.dts diff --git a/tools/binman/test/019_pack_inv_image_align.dts b/tools/binmanu/test/019_pack_inv_image_align.dts similarity index 100% rename from tools/binman/test/019_pack_inv_image_align.dts rename to tools/binmanu/test/019_pack_inv_image_align.dts diff --git a/tools/binman/test/020_pack_inv_image_align_power2.dts b/tools/binmanu/test/020_pack_inv_image_align_power2.dts similarity index 100% rename from tools/binman/test/020_pack_inv_image_align_power2.dts rename to tools/binmanu/test/020_pack_inv_image_align_power2.dts diff --git a/tools/binman/test/021_image_pad.dts b/tools/binmanu/test/021_image_pad.dts similarity index 100% rename from tools/binman/test/021_image_pad.dts rename to tools/binmanu/test/021_image_pad.dts diff --git a/tools/binman/test/022_image_name.dts b/tools/binmanu/test/022_image_name.dts similarity index 100% rename from tools/binman/test/022_image_name.dts rename to tools/binmanu/test/022_image_name.dts diff --git a/tools/binman/test/023_blob.dts b/tools/binmanu/test/023_blob.dts similarity index 100% rename from tools/binman/test/023_blob.dts rename to tools/binmanu/test/023_blob.dts diff --git a/tools/binman/test/024_sorted.dts b/tools/binmanu/test/024_sorted.dts similarity index 100% rename from tools/binman/test/024_sorted.dts rename to tools/binmanu/test/024_sorted.dts diff --git a/tools/binman/test/025_pack_zero_size.dts b/tools/binmanu/test/025_pack_zero_size.dts similarity index 100% rename from tools/binman/test/025_pack_zero_size.dts rename to tools/binmanu/test/025_pack_zero_size.dts diff --git a/tools/binman/test/026_pack_u_boot_dtb.dts b/tools/binmanu/test/026_pack_u_boot_dtb.dts similarity index 100% rename from tools/binman/test/026_pack_u_boot_dtb.dts rename to tools/binmanu/test/026_pack_u_boot_dtb.dts diff --git a/tools/binman/test/027_pack_4gb_no_size.dts b/tools/binmanu/test/027_pack_4gb_no_size.dts similarity index 100% rename from tools/binman/test/027_pack_4gb_no_size.dts rename to tools/binmanu/test/027_pack_4gb_no_size.dts diff --git a/tools/binman/test/028_pack_4gb_outside.dts b/tools/binmanu/test/028_pack_4gb_outside.dts similarity index 100% rename from tools/binman/test/028_pack_4gb_outside.dts rename to tools/binmanu/test/028_pack_4gb_outside.dts diff --git a/tools/binman/test/029_x86_rom.dts b/tools/binmanu/test/029_x86_rom.dts similarity index 100% rename from tools/binman/test/029_x86_rom.dts rename to tools/binmanu/test/029_x86_rom.dts diff --git a/tools/binman/test/030_x86_rom_me_no_desc.dts b/tools/binmanu/test/030_x86_rom_me_no_desc.dts similarity index 100% rename from tools/binman/test/030_x86_rom_me_no_desc.dts rename to tools/binmanu/test/030_x86_rom_me_no_desc.dts diff --git a/tools/binman/test/031_x86_rom_me.dts b/tools/binmanu/test/031_x86_rom_me.dts similarity index 100% rename from tools/binman/test/031_x86_rom_me.dts rename to tools/binmanu/test/031_x86_rom_me.dts diff --git a/tools/binman/test/032_intel_vga.dts b/tools/binmanu/test/032_intel_vga.dts similarity index 100% rename from tools/binman/test/032_intel_vga.dts rename to tools/binmanu/test/032_intel_vga.dts diff --git a/tools/binman/test/033_x86_start16.dts b/tools/binmanu/test/033_x86_start16.dts similarity index 100% rename from tools/binman/test/033_x86_start16.dts rename to tools/binmanu/test/033_x86_start16.dts diff --git a/tools/binman/test/034_x86_ucode.dts b/tools/binmanu/test/034_x86_ucode.dts similarity index 100% rename from tools/binman/test/034_x86_ucode.dts rename to tools/binmanu/test/034_x86_ucode.dts diff --git a/tools/binman/test/035_x86_single_ucode.dts b/tools/binmanu/test/035_x86_single_ucode.dts similarity index 100% rename from tools/binman/test/035_x86_single_ucode.dts rename to tools/binmanu/test/035_x86_single_ucode.dts diff --git a/tools/binman/test/036_u_boot_img.dts b/tools/binmanu/test/036_u_boot_img.dts similarity index 100% rename from tools/binman/test/036_u_boot_img.dts rename to tools/binmanu/test/036_u_boot_img.dts diff --git a/tools/binman/test/037_x86_no_ucode.dts b/tools/binmanu/test/037_x86_no_ucode.dts similarity index 100% rename from tools/binman/test/037_x86_no_ucode.dts rename to tools/binmanu/test/037_x86_no_ucode.dts diff --git a/tools/binman/test/038_x86_ucode_missing_node.dts b/tools/binmanu/test/038_x86_ucode_missing_node.dts similarity index 100% rename from tools/binman/test/038_x86_ucode_missing_node.dts rename to tools/binmanu/test/038_x86_ucode_missing_node.dts diff --git a/tools/binman/test/039_x86_ucode_missing_node2.dts b/tools/binmanu/test/039_x86_ucode_missing_node2.dts similarity index 100% rename from tools/binman/test/039_x86_ucode_missing_node2.dts rename to tools/binmanu/test/039_x86_ucode_missing_node2.dts diff --git a/tools/binman/test/040_x86_ucode_not_in_image.dts b/tools/binmanu/test/040_x86_ucode_not_in_image.dts similarity index 100% rename from tools/binman/test/040_x86_ucode_not_in_image.dts rename to tools/binmanu/test/040_x86_ucode_not_in_image.dts diff --git a/tools/binman/test/041_unknown_pos_size.dts b/tools/binmanu/test/041_unknown_pos_size.dts similarity index 100% rename from tools/binman/test/041_unknown_pos_size.dts rename to tools/binmanu/test/041_unknown_pos_size.dts diff --git a/tools/binman/test/042_intel_fsp.dts b/tools/binmanu/test/042_intel_fsp.dts similarity index 100% rename from tools/binman/test/042_intel_fsp.dts rename to tools/binmanu/test/042_intel_fsp.dts diff --git a/tools/binman/test/043_intel_cmc.dts b/tools/binmanu/test/043_intel_cmc.dts similarity index 100% rename from tools/binman/test/043_intel_cmc.dts rename to tools/binmanu/test/043_intel_cmc.dts diff --git a/tools/binman/test/044_x86_optional_ucode.dts b/tools/binmanu/test/044_x86_optional_ucode.dts similarity index 100% rename from tools/binman/test/044_x86_optional_ucode.dts rename to tools/binmanu/test/044_x86_optional_ucode.dts diff --git a/tools/binman/test/045_prop_test.dts b/tools/binmanu/test/045_prop_test.dts similarity index 100% rename from tools/binman/test/045_prop_test.dts rename to tools/binmanu/test/045_prop_test.dts diff --git a/tools/binman/test/046_intel_vbt.dts b/tools/binmanu/test/046_intel_vbt.dts similarity index 100% rename from tools/binman/test/046_intel_vbt.dts rename to tools/binmanu/test/046_intel_vbt.dts diff --git a/tools/binman/test/047_spl_bss_pad.dts b/tools/binmanu/test/047_spl_bss_pad.dts similarity index 100% rename from tools/binman/test/047_spl_bss_pad.dts rename to tools/binmanu/test/047_spl_bss_pad.dts diff --git a/tools/binman/test/048_x86_start16_spl.dts b/tools/binmanu/test/048_x86_start16_spl.dts similarity index 100% rename from tools/binman/test/048_x86_start16_spl.dts rename to tools/binmanu/test/048_x86_start16_spl.dts diff --git a/tools/binman/test/049_x86_ucode_spl.dts b/tools/binmanu/test/049_x86_ucode_spl.dts similarity index 100% rename from tools/binman/test/049_x86_ucode_spl.dts rename to tools/binmanu/test/049_x86_ucode_spl.dts diff --git a/tools/binman/test/050_intel_mrc.dts b/tools/binmanu/test/050_intel_mrc.dts similarity index 100% rename from tools/binman/test/050_intel_mrc.dts rename to tools/binmanu/test/050_intel_mrc.dts diff --git a/tools/binman/test/051_u_boot_spl_dtb.dts b/tools/binmanu/test/051_u_boot_spl_dtb.dts similarity index 100% rename from tools/binman/test/051_u_boot_spl_dtb.dts rename to tools/binmanu/test/051_u_boot_spl_dtb.dts diff --git a/tools/binman/test/052_u_boot_spl_nodtb.dts b/tools/binmanu/test/052_u_boot_spl_nodtb.dts similarity index 100% rename from tools/binman/test/052_u_boot_spl_nodtb.dts rename to tools/binmanu/test/052_u_boot_spl_nodtb.dts diff --git a/tools/binman/test/053_symbols.dts b/tools/binmanu/test/053_symbols.dts similarity index 100% rename from tools/binman/test/053_symbols.dts rename to tools/binmanu/test/053_symbols.dts diff --git a/tools/binman/test/054_unit_address.dts b/tools/binmanu/test/054_unit_address.dts similarity index 100% rename from tools/binman/test/054_unit_address.dts rename to tools/binmanu/test/054_unit_address.dts diff --git a/tools/binman/test/055_sections.dts b/tools/binmanu/test/055_sections.dts similarity index 100% rename from tools/binman/test/055_sections.dts rename to tools/binmanu/test/055_sections.dts diff --git a/tools/binman/test/056_name_prefix.dts b/tools/binmanu/test/056_name_prefix.dts similarity index 100% rename from tools/binman/test/056_name_prefix.dts rename to tools/binmanu/test/056_name_prefix.dts diff --git a/tools/binman/test/057_unknown_contents.dts b/tools/binmanu/test/057_unknown_contents.dts similarity index 100% rename from tools/binman/test/057_unknown_contents.dts rename to tools/binmanu/test/057_unknown_contents.dts diff --git a/tools/binman/test/058_x86_ucode_spl_needs_retry.dts b/tools/binmanu/test/058_x86_ucode_spl_needs_retry.dts similarity index 100% rename from tools/binman/test/058_x86_ucode_spl_needs_retry.dts rename to tools/binmanu/test/058_x86_ucode_spl_needs_retry.dts diff --git a/tools/binman/test/059_change_size.dts b/tools/binmanu/test/059_change_size.dts similarity index 100% rename from tools/binman/test/059_change_size.dts rename to tools/binmanu/test/059_change_size.dts diff --git a/tools/binman/test/060_fdt_update.dts b/tools/binmanu/test/060_fdt_update.dts similarity index 100% rename from tools/binman/test/060_fdt_update.dts rename to tools/binmanu/test/060_fdt_update.dts diff --git a/tools/binman/test/061_fdt_update_bad.dts b/tools/binmanu/test/061_fdt_update_bad.dts similarity index 100% rename from tools/binman/test/061_fdt_update_bad.dts rename to tools/binmanu/test/061_fdt_update_bad.dts diff --git a/tools/binman/test/062_entry_args.dts b/tools/binmanu/test/062_entry_args.dts similarity index 100% rename from tools/binman/test/062_entry_args.dts rename to tools/binmanu/test/062_entry_args.dts diff --git a/tools/binman/test/063_entry_args_missing.dts b/tools/binmanu/test/063_entry_args_missing.dts similarity index 100% rename from tools/binman/test/063_entry_args_missing.dts rename to tools/binmanu/test/063_entry_args_missing.dts diff --git a/tools/binman/test/064_entry_args_required.dts b/tools/binmanu/test/064_entry_args_required.dts similarity index 100% rename from tools/binman/test/064_entry_args_required.dts rename to tools/binmanu/test/064_entry_args_required.dts diff --git a/tools/binman/test/065_entry_args_unknown_datatype.dts b/tools/binmanu/test/065_entry_args_unknown_datatype.dts similarity index 100% rename from tools/binman/test/065_entry_args_unknown_datatype.dts rename to tools/binmanu/test/065_entry_args_unknown_datatype.dts diff --git a/tools/binman/test/066_text.dts b/tools/binmanu/test/066_text.dts similarity index 100% rename from tools/binman/test/066_text.dts rename to tools/binmanu/test/066_text.dts diff --git a/tools/binman/test/067_fmap.dts b/tools/binmanu/test/067_fmap.dts similarity index 100% rename from tools/binman/test/067_fmap.dts rename to tools/binmanu/test/067_fmap.dts diff --git a/tools/binman/test/068_blob_named_by_arg.dts b/tools/binmanu/test/068_blob_named_by_arg.dts similarity index 100% rename from tools/binman/test/068_blob_named_by_arg.dts rename to tools/binmanu/test/068_blob_named_by_arg.dts diff --git a/tools/binman/test/069_fill.dts b/tools/binmanu/test/069_fill.dts similarity index 100% rename from tools/binman/test/069_fill.dts rename to tools/binmanu/test/069_fill.dts diff --git a/tools/binman/test/070_fill_no_size.dts b/tools/binmanu/test/070_fill_no_size.dts similarity index 100% rename from tools/binman/test/070_fill_no_size.dts rename to tools/binmanu/test/070_fill_no_size.dts diff --git a/tools/binman/test/071_gbb.dts b/tools/binmanu/test/071_gbb.dts similarity index 100% rename from tools/binman/test/071_gbb.dts rename to tools/binmanu/test/071_gbb.dts diff --git a/tools/binman/test/072_gbb_too_small.dts b/tools/binmanu/test/072_gbb_too_small.dts similarity index 100% rename from tools/binman/test/072_gbb_too_small.dts rename to tools/binmanu/test/072_gbb_too_small.dts diff --git a/tools/binman/test/073_gbb_no_size.dts b/tools/binmanu/test/073_gbb_no_size.dts similarity index 100% rename from tools/binman/test/073_gbb_no_size.dts rename to tools/binmanu/test/073_gbb_no_size.dts diff --git a/tools/binman/test/074_vblock.dts b/tools/binmanu/test/074_vblock.dts similarity index 100% rename from tools/binman/test/074_vblock.dts rename to tools/binmanu/test/074_vblock.dts diff --git a/tools/binman/test/075_vblock_no_content.dts b/tools/binmanu/test/075_vblock_no_content.dts similarity index 100% rename from tools/binman/test/075_vblock_no_content.dts rename to tools/binmanu/test/075_vblock_no_content.dts diff --git a/tools/binman/test/076_vblock_bad_phandle.dts b/tools/binmanu/test/076_vblock_bad_phandle.dts similarity index 100% rename from tools/binman/test/076_vblock_bad_phandle.dts rename to tools/binmanu/test/076_vblock_bad_phandle.dts diff --git a/tools/binman/test/077_vblock_bad_entry.dts b/tools/binmanu/test/077_vblock_bad_entry.dts similarity index 100% rename from tools/binman/test/077_vblock_bad_entry.dts rename to tools/binmanu/test/077_vblock_bad_entry.dts diff --git a/tools/binman/test/078_u_boot_tpl.dts b/tools/binmanu/test/078_u_boot_tpl.dts similarity index 100% rename from tools/binman/test/078_u_boot_tpl.dts rename to tools/binmanu/test/078_u_boot_tpl.dts diff --git a/tools/binman/test/079_uses_pos.dts b/tools/binmanu/test/079_uses_pos.dts similarity index 100% rename from tools/binman/test/079_uses_pos.dts rename to tools/binmanu/test/079_uses_pos.dts diff --git a/tools/binman/test/080_fill_empty.dts b/tools/binmanu/test/080_fill_empty.dts similarity index 100% rename from tools/binman/test/080_fill_empty.dts rename to tools/binmanu/test/080_fill_empty.dts diff --git a/tools/binman/test/081_x86_start16_tpl.dts b/tools/binmanu/test/081_x86_start16_tpl.dts similarity index 100% rename from tools/binman/test/081_x86_start16_tpl.dts rename to tools/binmanu/test/081_x86_start16_tpl.dts diff --git a/tools/binman/test/082_fdt_update_all.dts b/tools/binmanu/test/082_fdt_update_all.dts similarity index 100% rename from tools/binman/test/082_fdt_update_all.dts rename to tools/binmanu/test/082_fdt_update_all.dts diff --git a/tools/binman/test/083_compress.dts b/tools/binmanu/test/083_compress.dts similarity index 100% rename from tools/binman/test/083_compress.dts rename to tools/binmanu/test/083_compress.dts diff --git a/tools/binman/test/084_files.dts b/tools/binmanu/test/084_files.dts similarity index 100% rename from tools/binman/test/084_files.dts rename to tools/binmanu/test/084_files.dts diff --git a/tools/binman/test/085_files_compress.dts b/tools/binmanu/test/085_files_compress.dts similarity index 100% rename from tools/binman/test/085_files_compress.dts rename to tools/binmanu/test/085_files_compress.dts diff --git a/tools/binman/test/086_files_none.dts b/tools/binmanu/test/086_files_none.dts similarity index 100% rename from tools/binman/test/086_files_none.dts rename to tools/binmanu/test/086_files_none.dts diff --git a/tools/binman/test/087_files_no_pattern.dts b/tools/binmanu/test/087_files_no_pattern.dts similarity index 100% rename from tools/binman/test/087_files_no_pattern.dts rename to tools/binmanu/test/087_files_no_pattern.dts diff --git a/tools/binman/test/088_extend_size.dts b/tools/binmanu/test/088_extend_size.dts similarity index 100% rename from tools/binman/test/088_extend_size.dts rename to tools/binmanu/test/088_extend_size.dts diff --git a/tools/binman/test/089_extend_size_bad.dts b/tools/binmanu/test/089_extend_size_bad.dts similarity index 100% rename from tools/binman/test/089_extend_size_bad.dts rename to tools/binmanu/test/089_extend_size_bad.dts diff --git a/tools/binman/test/090_hash.dts b/tools/binmanu/test/090_hash.dts similarity index 100% rename from tools/binman/test/090_hash.dts rename to tools/binmanu/test/090_hash.dts diff --git a/tools/binman/test/091_hash_no_algo.dts b/tools/binmanu/test/091_hash_no_algo.dts similarity index 100% rename from tools/binman/test/091_hash_no_algo.dts rename to tools/binmanu/test/091_hash_no_algo.dts diff --git a/tools/binman/test/092_hash_bad_algo.dts b/tools/binmanu/test/092_hash_bad_algo.dts similarity index 100% rename from tools/binman/test/092_hash_bad_algo.dts rename to tools/binmanu/test/092_hash_bad_algo.dts diff --git a/tools/binman/test/093_x86_tpl_ucode.dts b/tools/binmanu/test/093_x86_tpl_ucode.dts similarity index 100% rename from tools/binman/test/093_x86_tpl_ucode.dts rename to tools/binmanu/test/093_x86_tpl_ucode.dts diff --git a/tools/binman/test/094_fmap_x86.dts b/tools/binmanu/test/094_fmap_x86.dts similarity index 100% rename from tools/binman/test/094_fmap_x86.dts rename to tools/binmanu/test/094_fmap_x86.dts diff --git a/tools/binman/test/095_fmap_x86_section.dts b/tools/binmanu/test/095_fmap_x86_section.dts similarity index 100% rename from tools/binman/test/095_fmap_x86_section.dts rename to tools/binmanu/test/095_fmap_x86_section.dts diff --git a/tools/binman/test/096_elf.dts b/tools/binmanu/test/096_elf.dts similarity index 100% rename from tools/binman/test/096_elf.dts rename to tools/binmanu/test/096_elf.dts diff --git a/tools/binman/test/097_elf_strip.dts b/tools/binmanu/test/097_elf_strip.dts similarity index 100% rename from tools/binman/test/097_elf_strip.dts rename to tools/binmanu/test/097_elf_strip.dts diff --git a/tools/binman/test/098_4gb_and_skip_at_start_together.dts b/tools/binmanu/test/098_4gb_and_skip_at_start_together.dts similarity index 100% rename from tools/binman/test/098_4gb_and_skip_at_start_together.dts rename to tools/binmanu/test/098_4gb_and_skip_at_start_together.dts diff --git a/tools/binman/test/099_hash_section.dts b/tools/binmanu/test/099_hash_section.dts similarity index 100% rename from tools/binman/test/099_hash_section.dts rename to tools/binmanu/test/099_hash_section.dts diff --git a/tools/binman/test/100_intel_refcode.dts b/tools/binmanu/test/100_intel_refcode.dts similarity index 100% rename from tools/binman/test/100_intel_refcode.dts rename to tools/binmanu/test/100_intel_refcode.dts diff --git a/tools/binman/test/101_sections_offset.dts b/tools/binmanu/test/101_sections_offset.dts similarity index 100% rename from tools/binman/test/101_sections_offset.dts rename to tools/binmanu/test/101_sections_offset.dts diff --git a/tools/binman/test/102_cbfs_raw.dts b/tools/binmanu/test/102_cbfs_raw.dts similarity index 100% rename from tools/binman/test/102_cbfs_raw.dts rename to tools/binmanu/test/102_cbfs_raw.dts diff --git a/tools/binman/test/103_cbfs_raw_ppc.dts b/tools/binmanu/test/103_cbfs_raw_ppc.dts similarity index 100% rename from tools/binman/test/103_cbfs_raw_ppc.dts rename to tools/binmanu/test/103_cbfs_raw_ppc.dts diff --git a/tools/binman/test/104_cbfs_stage.dts b/tools/binmanu/test/104_cbfs_stage.dts similarity index 100% rename from tools/binman/test/104_cbfs_stage.dts rename to tools/binmanu/test/104_cbfs_stage.dts diff --git a/tools/binman/test/105_cbfs_raw_compress.dts b/tools/binmanu/test/105_cbfs_raw_compress.dts similarity index 100% rename from tools/binman/test/105_cbfs_raw_compress.dts rename to tools/binmanu/test/105_cbfs_raw_compress.dts diff --git a/tools/binman/test/106_cbfs_bad_arch.dts b/tools/binmanu/test/106_cbfs_bad_arch.dts similarity index 100% rename from tools/binman/test/106_cbfs_bad_arch.dts rename to tools/binmanu/test/106_cbfs_bad_arch.dts diff --git a/tools/binman/test/107_cbfs_no_size.dts b/tools/binmanu/test/107_cbfs_no_size.dts similarity index 100% rename from tools/binman/test/107_cbfs_no_size.dts rename to tools/binmanu/test/107_cbfs_no_size.dts diff --git a/tools/binman/test/108_cbfs_no_contents.dts b/tools/binmanu/test/108_cbfs_no_contents.dts similarity index 100% rename from tools/binman/test/108_cbfs_no_contents.dts rename to tools/binmanu/test/108_cbfs_no_contents.dts diff --git a/tools/binman/test/109_cbfs_bad_compress.dts b/tools/binmanu/test/109_cbfs_bad_compress.dts similarity index 100% rename from tools/binman/test/109_cbfs_bad_compress.dts rename to tools/binmanu/test/109_cbfs_bad_compress.dts diff --git a/tools/binman/test/110_cbfs_name.dts b/tools/binmanu/test/110_cbfs_name.dts similarity index 100% rename from tools/binman/test/110_cbfs_name.dts rename to tools/binmanu/test/110_cbfs_name.dts diff --git a/tools/binman/test/111_x86_rom_ifwi.dts b/tools/binmanu/test/111_x86_rom_ifwi.dts similarity index 100% rename from tools/binman/test/111_x86_rom_ifwi.dts rename to tools/binmanu/test/111_x86_rom_ifwi.dts diff --git a/tools/binman/test/112_x86_rom_ifwi_nodesc.dts b/tools/binmanu/test/112_x86_rom_ifwi_nodesc.dts similarity index 100% rename from tools/binman/test/112_x86_rom_ifwi_nodesc.dts rename to tools/binmanu/test/112_x86_rom_ifwi_nodesc.dts diff --git a/tools/binman/test/113_x86_rom_ifwi_nodata.dts b/tools/binmanu/test/113_x86_rom_ifwi_nodata.dts similarity index 100% rename from tools/binman/test/113_x86_rom_ifwi_nodata.dts rename to tools/binmanu/test/113_x86_rom_ifwi_nodata.dts diff --git a/tools/binman/test/114_cbfs_offset.dts b/tools/binmanu/test/114_cbfs_offset.dts similarity index 100% rename from tools/binman/test/114_cbfs_offset.dts rename to tools/binmanu/test/114_cbfs_offset.dts diff --git a/tools/binman/test/115_fdtmap.dts b/tools/binmanu/test/115_fdtmap.dts similarity index 100% rename from tools/binman/test/115_fdtmap.dts rename to tools/binmanu/test/115_fdtmap.dts diff --git a/tools/binman/test/116_fdtmap_hdr.dts b/tools/binmanu/test/116_fdtmap_hdr.dts similarity index 100% rename from tools/binman/test/116_fdtmap_hdr.dts rename to tools/binmanu/test/116_fdtmap_hdr.dts diff --git a/tools/binman/test/117_fdtmap_hdr_start.dts b/tools/binmanu/test/117_fdtmap_hdr_start.dts similarity index 100% rename from tools/binman/test/117_fdtmap_hdr_start.dts rename to tools/binmanu/test/117_fdtmap_hdr_start.dts diff --git a/tools/binman/test/118_fdtmap_hdr_pos.dts b/tools/binmanu/test/118_fdtmap_hdr_pos.dts similarity index 100% rename from tools/binman/test/118_fdtmap_hdr_pos.dts rename to tools/binmanu/test/118_fdtmap_hdr_pos.dts diff --git a/tools/binman/test/119_fdtmap_hdr_missing.dts b/tools/binmanu/test/119_fdtmap_hdr_missing.dts similarity index 100% rename from tools/binman/test/119_fdtmap_hdr_missing.dts rename to tools/binmanu/test/119_fdtmap_hdr_missing.dts diff --git a/tools/binman/test/120_hdr_no_location.dts b/tools/binmanu/test/120_hdr_no_location.dts similarity index 100% rename from tools/binman/test/120_hdr_no_location.dts rename to tools/binmanu/test/120_hdr_no_location.dts diff --git a/tools/binman/test/121_entry_extend.dts b/tools/binmanu/test/121_entry_extend.dts similarity index 100% rename from tools/binman/test/121_entry_extend.dts rename to tools/binmanu/test/121_entry_extend.dts diff --git a/tools/binman/test/122_entry_extend_twice.dts b/tools/binmanu/test/122_entry_extend_twice.dts similarity index 100% rename from tools/binman/test/122_entry_extend_twice.dts rename to tools/binmanu/test/122_entry_extend_twice.dts diff --git a/tools/binman/test/123_entry_extend_section.dts b/tools/binmanu/test/123_entry_extend_section.dts similarity index 100% rename from tools/binman/test/123_entry_extend_section.dts rename to tools/binmanu/test/123_entry_extend_section.dts diff --git a/tools/binman/test/124_compress_dtb.dts b/tools/binmanu/test/124_compress_dtb.dts similarity index 100% rename from tools/binman/test/124_compress_dtb.dts rename to tools/binmanu/test/124_compress_dtb.dts diff --git a/tools/binman/test/125_cbfs_update.dts b/tools/binmanu/test/125_cbfs_update.dts similarity index 100% rename from tools/binman/test/125_cbfs_update.dts rename to tools/binmanu/test/125_cbfs_update.dts diff --git a/tools/binman/test/126_cbfs_bad_type.dts b/tools/binmanu/test/126_cbfs_bad_type.dts similarity index 100% rename from tools/binman/test/126_cbfs_bad_type.dts rename to tools/binmanu/test/126_cbfs_bad_type.dts diff --git a/tools/binman/test/127_list.dts b/tools/binmanu/test/127_list.dts similarity index 100% rename from tools/binman/test/127_list.dts rename to tools/binmanu/test/127_list.dts diff --git a/tools/binman/test/128_decode_image.dts b/tools/binmanu/test/128_decode_image.dts similarity index 100% rename from tools/binman/test/128_decode_image.dts rename to tools/binmanu/test/128_decode_image.dts diff --git a/tools/binman/test/129_decode_image_nohdr.dts b/tools/binmanu/test/129_decode_image_nohdr.dts similarity index 100% rename from tools/binman/test/129_decode_image_nohdr.dts rename to tools/binmanu/test/129_decode_image_nohdr.dts diff --git a/tools/binman/test/130_list_fdtmap.dts b/tools/binmanu/test/130_list_fdtmap.dts similarity index 100% rename from tools/binman/test/130_list_fdtmap.dts rename to tools/binmanu/test/130_list_fdtmap.dts diff --git a/tools/binman/test/131_pack_align_section.dts b/tools/binmanu/test/131_pack_align_section.dts similarity index 100% rename from tools/binman/test/131_pack_align_section.dts rename to tools/binmanu/test/131_pack_align_section.dts diff --git a/tools/binman/test/132_replace.dts b/tools/binmanu/test/132_replace.dts similarity index 100% rename from tools/binman/test/132_replace.dts rename to tools/binmanu/test/132_replace.dts diff --git a/tools/binman/test/133_replace_multi.dts b/tools/binmanu/test/133_replace_multi.dts similarity index 100% rename from tools/binman/test/133_replace_multi.dts rename to tools/binmanu/test/133_replace_multi.dts diff --git a/tools/binman/test/134_fdt_update_all_repack.dts b/tools/binmanu/test/134_fdt_update_all_repack.dts similarity index 100% rename from tools/binman/test/134_fdt_update_all_repack.dts rename to tools/binmanu/test/134_fdt_update_all_repack.dts diff --git a/tools/binman/test/135_fdtmap_hdr_middle.dts b/tools/binmanu/test/135_fdtmap_hdr_middle.dts similarity index 100% rename from tools/binman/test/135_fdtmap_hdr_middle.dts rename to tools/binmanu/test/135_fdtmap_hdr_middle.dts diff --git a/tools/binman/test/136_fdtmap_hdr_startbad.dts b/tools/binmanu/test/136_fdtmap_hdr_startbad.dts similarity index 100% rename from tools/binman/test/136_fdtmap_hdr_startbad.dts rename to tools/binmanu/test/136_fdtmap_hdr_startbad.dts diff --git a/tools/binman/test/137_fdtmap_hdr_endbad.dts b/tools/binmanu/test/137_fdtmap_hdr_endbad.dts similarity index 100% rename from tools/binman/test/137_fdtmap_hdr_endbad.dts rename to tools/binmanu/test/137_fdtmap_hdr_endbad.dts diff --git a/tools/binman/test/138_fdtmap_hdr_nosize.dts b/tools/binmanu/test/138_fdtmap_hdr_nosize.dts similarity index 100% rename from tools/binman/test/138_fdtmap_hdr_nosize.dts rename to tools/binmanu/test/138_fdtmap_hdr_nosize.dts diff --git a/tools/binman/test/139_replace_repack.dts b/tools/binmanu/test/139_replace_repack.dts similarity index 100% rename from tools/binman/test/139_replace_repack.dts rename to tools/binmanu/test/139_replace_repack.dts diff --git a/tools/binman/test/140_entry_shrink.dts b/tools/binmanu/test/140_entry_shrink.dts similarity index 100% rename from tools/binman/test/140_entry_shrink.dts rename to tools/binmanu/test/140_entry_shrink.dts diff --git a/tools/binman/test/141_descriptor_offset.dts b/tools/binmanu/test/141_descriptor_offset.dts similarity index 100% rename from tools/binman/test/141_descriptor_offset.dts rename to tools/binmanu/test/141_descriptor_offset.dts diff --git a/tools/binman/test/142_replace_cbfs.dts b/tools/binmanu/test/142_replace_cbfs.dts similarity index 100% rename from tools/binman/test/142_replace_cbfs.dts rename to tools/binmanu/test/142_replace_cbfs.dts diff --git a/tools/binman/test/143_replace_all.dts b/tools/binmanu/test/143_replace_all.dts similarity index 100% rename from tools/binman/test/143_replace_all.dts rename to tools/binmanu/test/143_replace_all.dts diff --git a/tools/binman/test/144_x86_reset16.dts b/tools/binmanu/test/144_x86_reset16.dts similarity index 100% rename from tools/binman/test/144_x86_reset16.dts rename to tools/binmanu/test/144_x86_reset16.dts diff --git a/tools/binman/test/145_x86_reset16_spl.dts b/tools/binmanu/test/145_x86_reset16_spl.dts similarity index 100% rename from tools/binman/test/145_x86_reset16_spl.dts rename to tools/binmanu/test/145_x86_reset16_spl.dts diff --git a/tools/binman/test/146_x86_reset16_tpl.dts b/tools/binmanu/test/146_x86_reset16_tpl.dts similarity index 100% rename from tools/binman/test/146_x86_reset16_tpl.dts rename to tools/binmanu/test/146_x86_reset16_tpl.dts diff --git a/tools/binman/test/147_intel_fit.dts b/tools/binmanu/test/147_intel_fit.dts similarity index 100% rename from tools/binman/test/147_intel_fit.dts rename to tools/binmanu/test/147_intel_fit.dts diff --git a/tools/binman/test/148_intel_fit_missing.dts b/tools/binmanu/test/148_intel_fit_missing.dts similarity index 100% rename from tools/binman/test/148_intel_fit_missing.dts rename to tools/binmanu/test/148_intel_fit_missing.dts diff --git a/tools/binman/test/149_symbols_tpl.dts b/tools/binmanu/test/149_symbols_tpl.dts similarity index 100% rename from tools/binman/test/149_symbols_tpl.dts rename to tools/binmanu/test/149_symbols_tpl.dts diff --git a/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binmanu/test/150_powerpc_mpc85xx_bootpg_resetvec.dts similarity index 100% rename from tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts rename to tools/binmanu/test/150_powerpc_mpc85xx_bootpg_resetvec.dts diff --git a/tools/binman/test/151_x86_rom_ifwi_section.dts b/tools/binmanu/test/151_x86_rom_ifwi_section.dts similarity index 100% rename from tools/binman/test/151_x86_rom_ifwi_section.dts rename to tools/binmanu/test/151_x86_rom_ifwi_section.dts diff --git a/tools/binman/test/152_intel_fsp_m.dts b/tools/binmanu/test/152_intel_fsp_m.dts similarity index 100% rename from tools/binman/test/152_intel_fsp_m.dts rename to tools/binmanu/test/152_intel_fsp_m.dts diff --git a/tools/binman/test/153_intel_fsp_s.dts b/tools/binmanu/test/153_intel_fsp_s.dts similarity index 100% rename from tools/binman/test/153_intel_fsp_s.dts rename to tools/binmanu/test/153_intel_fsp_s.dts diff --git a/tools/binman/test/154_intel_fsp_t.dts b/tools/binmanu/test/154_intel_fsp_t.dts similarity index 100% rename from tools/binman/test/154_intel_fsp_t.dts rename to tools/binmanu/test/154_intel_fsp_t.dts diff --git a/tools/binman/test/155_symbols_tpl_x86.dts b/tools/binmanu/test/155_symbols_tpl_x86.dts similarity index 100% rename from tools/binman/test/155_symbols_tpl_x86.dts rename to tools/binmanu/test/155_symbols_tpl_x86.dts diff --git a/tools/binman/test/156_mkimage.dts b/tools/binmanu/test/156_mkimage.dts similarity index 100% rename from tools/binman/test/156_mkimage.dts rename to tools/binmanu/test/156_mkimage.dts diff --git a/tools/binman/test/157_blob_ext.dts b/tools/binmanu/test/157_blob_ext.dts similarity index 100% rename from tools/binman/test/157_blob_ext.dts rename to tools/binmanu/test/157_blob_ext.dts diff --git a/tools/binman/test/158_blob_ext_missing.dts b/tools/binmanu/test/158_blob_ext_missing.dts similarity index 100% rename from tools/binman/test/158_blob_ext_missing.dts rename to tools/binmanu/test/158_blob_ext_missing.dts diff --git a/tools/binman/test/159_blob_ext_missing_sect.dts b/tools/binmanu/test/159_blob_ext_missing_sect.dts similarity index 100% rename from tools/binman/test/159_blob_ext_missing_sect.dts rename to tools/binmanu/test/159_blob_ext_missing_sect.dts diff --git a/tools/binman/test/160_pack_overlap_zero.dts b/tools/binmanu/test/160_pack_overlap_zero.dts similarity index 100% rename from tools/binman/test/160_pack_overlap_zero.dts rename to tools/binmanu/test/160_pack_overlap_zero.dts diff --git a/tools/binman/test/161_fit.dts b/tools/binmanu/test/161_fit.dts similarity index 100% rename from tools/binman/test/161_fit.dts rename to tools/binmanu/test/161_fit.dts diff --git a/tools/binman/test/162_fit_external.dts b/tools/binmanu/test/162_fit_external.dts similarity index 100% rename from tools/binman/test/162_fit_external.dts rename to tools/binmanu/test/162_fit_external.dts diff --git a/tools/binman/test/163_x86_rom_me_empty.dts b/tools/binmanu/test/163_x86_rom_me_empty.dts similarity index 100% rename from tools/binman/test/163_x86_rom_me_empty.dts rename to tools/binmanu/test/163_x86_rom_me_empty.dts diff --git a/tools/binman/test/164_x86_rom_me_missing.dts b/tools/binmanu/test/164_x86_rom_me_missing.dts similarity index 100% rename from tools/binman/test/164_x86_rom_me_missing.dts rename to tools/binmanu/test/164_x86_rom_me_missing.dts diff --git a/tools/binman/test/165_section_ignore_hash_signature.dts b/tools/binmanu/test/165_section_ignore_hash_signature.dts similarity index 100% rename from tools/binman/test/165_section_ignore_hash_signature.dts rename to tools/binmanu/test/165_section_ignore_hash_signature.dts diff --git a/tools/binman/test/166_pad_in_sections.dts b/tools/binmanu/test/166_pad_in_sections.dts similarity index 100% rename from tools/binman/test/166_pad_in_sections.dts rename to tools/binmanu/test/166_pad_in_sections.dts diff --git a/tools/binman/test/167_fit_image_subentry_alignment.dts b/tools/binmanu/test/167_fit_image_subentry_alignment.dts similarity index 100% rename from tools/binman/test/167_fit_image_subentry_alignment.dts rename to tools/binmanu/test/167_fit_image_subentry_alignment.dts diff --git a/tools/binman/test/168_fit_missing_blob.dts b/tools/binmanu/test/168_fit_missing_blob.dts similarity index 100% rename from tools/binman/test/168_fit_missing_blob.dts rename to tools/binmanu/test/168_fit_missing_blob.dts diff --git a/tools/binman/test/169_atf_bl31.dts b/tools/binmanu/test/169_atf_bl31.dts similarity index 100% rename from tools/binman/test/169_atf_bl31.dts rename to tools/binmanu/test/169_atf_bl31.dts diff --git a/tools/binman/test/170_fit_fdt.dts b/tools/binmanu/test/170_fit_fdt.dts similarity index 100% rename from tools/binman/test/170_fit_fdt.dts rename to tools/binmanu/test/170_fit_fdt.dts diff --git a/tools/binman/test/171_fit_fdt_missing_prop.dts b/tools/binmanu/test/171_fit_fdt_missing_prop.dts similarity index 100% rename from tools/binman/test/171_fit_fdt_missing_prop.dts rename to tools/binmanu/test/171_fit_fdt_missing_prop.dts diff --git a/tools/binman/test/172_scp.dts b/tools/binmanu/test/172_scp.dts similarity index 100% rename from tools/binman/test/172_scp.dts rename to tools/binmanu/test/172_scp.dts diff --git a/tools/binman/test/173_missing_blob.dts b/tools/binmanu/test/173_missing_blob.dts similarity index 100% rename from tools/binman/test/173_missing_blob.dts rename to tools/binmanu/test/173_missing_blob.dts diff --git a/tools/binman/test/174_env.dts b/tools/binmanu/test/174_env.dts similarity index 100% rename from tools/binman/test/174_env.dts rename to tools/binmanu/test/174_env.dts diff --git a/tools/binman/test/175_env_no_size.dts b/tools/binmanu/test/175_env_no_size.dts similarity index 100% rename from tools/binman/test/175_env_no_size.dts rename to tools/binmanu/test/175_env_no_size.dts diff --git a/tools/binman/test/176_env_too_small.dts b/tools/binmanu/test/176_env_too_small.dts similarity index 100% rename from tools/binman/test/176_env_too_small.dts rename to tools/binmanu/test/176_env_too_small.dts diff --git a/tools/binman/test/177_skip_at_start.dts b/tools/binmanu/test/177_skip_at_start.dts similarity index 100% rename from tools/binman/test/177_skip_at_start.dts rename to tools/binmanu/test/177_skip_at_start.dts diff --git a/tools/binman/test/178_skip_at_start_pad.dts b/tools/binmanu/test/178_skip_at_start_pad.dts similarity index 100% rename from tools/binman/test/178_skip_at_start_pad.dts rename to tools/binmanu/test/178_skip_at_start_pad.dts diff --git a/tools/binman/test/179_skip_at_start_section_pad.dts b/tools/binmanu/test/179_skip_at_start_section_pad.dts similarity index 100% rename from tools/binman/test/179_skip_at_start_section_pad.dts rename to tools/binmanu/test/179_skip_at_start_section_pad.dts diff --git a/tools/binman/test/180_section_pad.dts b/tools/binmanu/test/180_section_pad.dts similarity index 100% rename from tools/binman/test/180_section_pad.dts rename to tools/binmanu/test/180_section_pad.dts diff --git a/tools/binman/test/181_section_align.dts b/tools/binmanu/test/181_section_align.dts similarity index 100% rename from tools/binman/test/181_section_align.dts rename to tools/binmanu/test/181_section_align.dts diff --git a/tools/binman/test/182_compress_image.dts b/tools/binmanu/test/182_compress_image.dts similarity index 100% rename from tools/binman/test/182_compress_image.dts rename to tools/binmanu/test/182_compress_image.dts diff --git a/tools/binman/test/183_compress_image_less.dts b/tools/binmanu/test/183_compress_image_less.dts similarity index 100% rename from tools/binman/test/183_compress_image_less.dts rename to tools/binmanu/test/183_compress_image_less.dts diff --git a/tools/binman/test/184_compress_section_size.dts b/tools/binmanu/test/184_compress_section_size.dts similarity index 100% rename from tools/binman/test/184_compress_section_size.dts rename to tools/binmanu/test/184_compress_section_size.dts diff --git a/tools/binman/test/185_compress_section.dts b/tools/binmanu/test/185_compress_section.dts similarity index 100% rename from tools/binman/test/185_compress_section.dts rename to tools/binmanu/test/185_compress_section.dts diff --git a/tools/binman/test/186_compress_extra.dts b/tools/binmanu/test/186_compress_extra.dts similarity index 100% rename from tools/binman/test/186_compress_extra.dts rename to tools/binmanu/test/186_compress_extra.dts diff --git a/tools/binman/test/187_symbols_sub.dts b/tools/binmanu/test/187_symbols_sub.dts similarity index 100% rename from tools/binman/test/187_symbols_sub.dts rename to tools/binmanu/test/187_symbols_sub.dts diff --git a/tools/binman/test/188_image_entryarg.dts b/tools/binmanu/test/188_image_entryarg.dts similarity index 100% rename from tools/binman/test/188_image_entryarg.dts rename to tools/binmanu/test/188_image_entryarg.dts diff --git a/tools/binman/test/189_vblock_content.dts b/tools/binmanu/test/189_vblock_content.dts similarity index 100% rename from tools/binman/test/189_vblock_content.dts rename to tools/binmanu/test/189_vblock_content.dts diff --git a/tools/binman/test/190_files_align.dts b/tools/binmanu/test/190_files_align.dts similarity index 100% rename from tools/binman/test/190_files_align.dts rename to tools/binmanu/test/190_files_align.dts diff --git a/tools/binman/test/191_read_image_skip.dts b/tools/binmanu/test/191_read_image_skip.dts similarity index 100% rename from tools/binman/test/191_read_image_skip.dts rename to tools/binmanu/test/191_read_image_skip.dts diff --git a/tools/binman/test/192_u_boot_tpl_nodtb.dts b/tools/binmanu/test/192_u_boot_tpl_nodtb.dts similarity index 100% rename from tools/binman/test/192_u_boot_tpl_nodtb.dts rename to tools/binmanu/test/192_u_boot_tpl_nodtb.dts diff --git a/tools/binman/test/193_tpl_bss_pad.dts b/tools/binmanu/test/193_tpl_bss_pad.dts similarity index 100% rename from tools/binman/test/193_tpl_bss_pad.dts rename to tools/binmanu/test/193_tpl_bss_pad.dts diff --git a/tools/binman/test/194_fdt_incl.dts b/tools/binmanu/test/194_fdt_incl.dts similarity index 100% rename from tools/binman/test/194_fdt_incl.dts rename to tools/binmanu/test/194_fdt_incl.dts diff --git a/tools/binman/test/195_fdt_incl_tpl.dts b/tools/binmanu/test/195_fdt_incl_tpl.dts similarity index 100% rename from tools/binman/test/195_fdt_incl_tpl.dts rename to tools/binmanu/test/195_fdt_incl_tpl.dts diff --git a/tools/binman/test/196_symbols_nodtb.dts b/tools/binmanu/test/196_symbols_nodtb.dts similarity index 100% rename from tools/binman/test/196_symbols_nodtb.dts rename to tools/binmanu/test/196_symbols_nodtb.dts diff --git a/tools/binman/test/197_symbols_expand.dts b/tools/binmanu/test/197_symbols_expand.dts similarity index 100% rename from tools/binman/test/197_symbols_expand.dts rename to tools/binmanu/test/197_symbols_expand.dts diff --git a/tools/binman/test/198_collection.dts b/tools/binmanu/test/198_collection.dts similarity index 100% rename from tools/binman/test/198_collection.dts rename to tools/binmanu/test/198_collection.dts diff --git a/tools/binman/test/199_collection_section.dts b/tools/binmanu/test/199_collection_section.dts similarity index 100% rename from tools/binman/test/199_collection_section.dts rename to tools/binmanu/test/199_collection_section.dts diff --git a/tools/binman/test/200_align_default.dts b/tools/binmanu/test/200_align_default.dts similarity index 100% rename from tools/binman/test/200_align_default.dts rename to tools/binmanu/test/200_align_default.dts diff --git a/tools/binman/test/201_opensbi.dts b/tools/binmanu/test/201_opensbi.dts similarity index 100% rename from tools/binman/test/201_opensbi.dts rename to tools/binmanu/test/201_opensbi.dts diff --git a/tools/binman/test/202_section_timeout.dts b/tools/binmanu/test/202_section_timeout.dts similarity index 100% rename from tools/binman/test/202_section_timeout.dts rename to tools/binmanu/test/202_section_timeout.dts diff --git a/tools/binman/test/203_fip.dts b/tools/binmanu/test/203_fip.dts similarity index 100% rename from tools/binman/test/203_fip.dts rename to tools/binmanu/test/203_fip.dts diff --git a/tools/binman/test/204_fip_other.dts b/tools/binmanu/test/204_fip_other.dts similarity index 100% rename from tools/binman/test/204_fip_other.dts rename to tools/binmanu/test/204_fip_other.dts diff --git a/tools/binman/test/205_fip_no_type.dts b/tools/binmanu/test/205_fip_no_type.dts similarity index 100% rename from tools/binman/test/205_fip_no_type.dts rename to tools/binmanu/test/205_fip_no_type.dts diff --git a/tools/binman/test/206_fip_uuid.dts b/tools/binmanu/test/206_fip_uuid.dts similarity index 100% rename from tools/binman/test/206_fip_uuid.dts rename to tools/binmanu/test/206_fip_uuid.dts diff --git a/tools/binman/test/207_fip_ls.dts b/tools/binmanu/test/207_fip_ls.dts similarity index 100% rename from tools/binman/test/207_fip_ls.dts rename to tools/binmanu/test/207_fip_ls.dts diff --git a/tools/binman/test/208_fip_replace.dts b/tools/binmanu/test/208_fip_replace.dts similarity index 100% rename from tools/binman/test/208_fip_replace.dts rename to tools/binmanu/test/208_fip_replace.dts diff --git a/tools/binman/test/209_fip_missing.dts b/tools/binmanu/test/209_fip_missing.dts similarity index 100% rename from tools/binman/test/209_fip_missing.dts rename to tools/binmanu/test/209_fip_missing.dts diff --git a/tools/binman/test/210_fip_size.dts b/tools/binmanu/test/210_fip_size.dts similarity index 100% rename from tools/binman/test/210_fip_size.dts rename to tools/binmanu/test/210_fip_size.dts diff --git a/tools/binman/test/211_fip_bad_align.dts b/tools/binmanu/test/211_fip_bad_align.dts similarity index 100% rename from tools/binman/test/211_fip_bad_align.dts rename to tools/binmanu/test/211_fip_bad_align.dts diff --git a/tools/binman/test/212_fip_collection.dts b/tools/binmanu/test/212_fip_collection.dts similarity index 100% rename from tools/binman/test/212_fip_collection.dts rename to tools/binmanu/test/212_fip_collection.dts diff --git a/tools/binman/test/213_fdtmap_alt_format.dts b/tools/binmanu/test/213_fdtmap_alt_format.dts similarity index 100% rename from tools/binman/test/213_fdtmap_alt_format.dts rename to tools/binmanu/test/213_fdtmap_alt_format.dts diff --git a/tools/binman/test/214_no_alt_format.dts b/tools/binmanu/test/214_no_alt_format.dts similarity index 100% rename from tools/binman/test/214_no_alt_format.dts rename to tools/binmanu/test/214_no_alt_format.dts diff --git a/tools/binman/test/215_blob_ext_list.dts b/tools/binmanu/test/215_blob_ext_list.dts similarity index 100% rename from tools/binman/test/215_blob_ext_list.dts rename to tools/binmanu/test/215_blob_ext_list.dts diff --git a/tools/binman/test/216_blob_ext_list_missing.dts b/tools/binmanu/test/216_blob_ext_list_missing.dts similarity index 100% rename from tools/binman/test/216_blob_ext_list_missing.dts rename to tools/binmanu/test/216_blob_ext_list_missing.dts diff --git a/tools/binman/test/217_fake_blob.dts b/tools/binmanu/test/217_fake_blob.dts similarity index 100% rename from tools/binman/test/217_fake_blob.dts rename to tools/binmanu/test/217_fake_blob.dts diff --git a/tools/binman/test/218_blob_ext_list_fake.dts b/tools/binmanu/test/218_blob_ext_list_fake.dts similarity index 100% rename from tools/binman/test/218_blob_ext_list_fake.dts rename to tools/binmanu/test/218_blob_ext_list_fake.dts diff --git a/tools/binman/test/219_fit_gennode.dts b/tools/binmanu/test/219_fit_gennode.dts similarity index 100% rename from tools/binman/test/219_fit_gennode.dts rename to tools/binmanu/test/219_fit_gennode.dts diff --git a/tools/binman/test/220_fit_subentry_bintool.dts b/tools/binmanu/test/220_fit_subentry_bintool.dts similarity index 100% rename from tools/binman/test/220_fit_subentry_bintool.dts rename to tools/binmanu/test/220_fit_subentry_bintool.dts diff --git a/tools/binman/test/221_fit_subentry_hash.dts b/tools/binmanu/test/221_fit_subentry_hash.dts similarity index 100% rename from tools/binman/test/221_fit_subentry_hash.dts rename to tools/binmanu/test/221_fit_subentry_hash.dts diff --git a/tools/binman/test/222_tee_os.dts b/tools/binmanu/test/222_tee_os.dts similarity index 100% rename from tools/binman/test/222_tee_os.dts rename to tools/binmanu/test/222_tee_os.dts diff --git a/tools/binman/test/223_fit_fdt_oper.dts b/tools/binmanu/test/223_fit_fdt_oper.dts similarity index 100% rename from tools/binman/test/223_fit_fdt_oper.dts rename to tools/binmanu/test/223_fit_fdt_oper.dts diff --git a/tools/binman/test/224_fit_bad_oper.dts b/tools/binmanu/test/224_fit_bad_oper.dts similarity index 100% rename from tools/binman/test/224_fit_bad_oper.dts rename to tools/binmanu/test/224_fit_bad_oper.dts diff --git a/tools/binman/test/225_expand_size_bad.dts b/tools/binmanu/test/225_expand_size_bad.dts similarity index 100% rename from tools/binman/test/225_expand_size_bad.dts rename to tools/binmanu/test/225_expand_size_bad.dts diff --git a/tools/binman/test/226_fit_split_elf.dts b/tools/binmanu/test/226_fit_split_elf.dts similarity index 100% rename from tools/binman/test/226_fit_split_elf.dts rename to tools/binmanu/test/226_fit_split_elf.dts diff --git a/tools/binman/test/227_fit_bad_dir.dts b/tools/binmanu/test/227_fit_bad_dir.dts similarity index 100% rename from tools/binman/test/227_fit_bad_dir.dts rename to tools/binmanu/test/227_fit_bad_dir.dts diff --git a/tools/binman/test/228_fit_bad_dir_config.dts b/tools/binmanu/test/228_fit_bad_dir_config.dts similarity index 100% rename from tools/binman/test/228_fit_bad_dir_config.dts rename to tools/binmanu/test/228_fit_bad_dir_config.dts diff --git a/tools/binman/test/229_mkimage_missing.dts b/tools/binmanu/test/229_mkimage_missing.dts similarity index 100% rename from tools/binman/test/229_mkimage_missing.dts rename to tools/binmanu/test/229_mkimage_missing.dts diff --git a/tools/binman/test/230_dev.key b/tools/binmanu/test/230_dev.key similarity index 100% rename from tools/binman/test/230_dev.key rename to tools/binmanu/test/230_dev.key diff --git a/tools/binman/test/230_pre_load.dts b/tools/binmanu/test/230_pre_load.dts similarity index 85% rename from tools/binman/test/230_pre_load.dts rename to tools/binmanu/test/230_pre_load.dts index c0c24729f82..000b3116347 100644 --- a/tools/binman/test/230_pre_load.dts +++ b/tools/binmanu/test/230_pre_load.dts @@ -10,7 +10,7 @@ pre-load { content = <&image>; algo-name = "sha256,rsa2048"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/231_pre_load_pkcs.dts b/tools/binmanu/test/231_pre_load_pkcs.dts similarity index 87% rename from tools/binman/test/231_pre_load_pkcs.dts rename to tools/binmanu/test/231_pre_load_pkcs.dts index 530638c56b6..01d803d6cb4 100644 --- a/tools/binman/test/231_pre_load_pkcs.dts +++ b/tools/binmanu/test/231_pre_load_pkcs.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/232_pre_load_pss.dts b/tools/binmanu/test/232_pre_load_pss.dts similarity index 86% rename from tools/binman/test/232_pre_load_pss.dts rename to tools/binmanu/test/232_pre_load_pss.dts index 371e0fdb408..d1ed691b147 100644 --- a/tools/binman/test/232_pre_load_pss.dts +++ b/tools/binmanu/test/232_pre_load_pss.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pss"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/233_pre_load_invalid_padding.dts b/tools/binmanu/test/233_pre_load_invalid_padding.dts similarity index 86% rename from tools/binman/test/233_pre_load_invalid_padding.dts rename to tools/binmanu/test/233_pre_load_invalid_padding.dts index 9cb4cb570bc..33e6ae8254e 100644 --- a/tools/binman/test/233_pre_load_invalid_padding.dts +++ b/tools/binmanu/test/233_pre_load_invalid_padding.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "padding"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/234_pre_load_invalid_sha.dts b/tools/binmanu/test/234_pre_load_invalid_sha.dts similarity index 86% rename from tools/binman/test/234_pre_load_invalid_sha.dts rename to tools/binmanu/test/234_pre_load_invalid_sha.dts index 8ded98df533..8e6b5dae3ea 100644 --- a/tools/binman/test/234_pre_load_invalid_sha.dts +++ b/tools/binmanu/test/234_pre_load_invalid_sha.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha2560,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/235_pre_load_invalid_algo.dts b/tools/binmanu/test/235_pre_load_invalid_algo.dts similarity index 86% rename from tools/binman/test/235_pre_load_invalid_algo.dts rename to tools/binmanu/test/235_pre_load_invalid_algo.dts index 145286caa3e..31c8d28ef06 100644 --- a/tools/binman/test/235_pre_load_invalid_algo.dts +++ b/tools/binmanu/test/235_pre_load_invalid_algo.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa20480"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/236_pre_load_invalid_key.dts b/tools/binmanu/test/236_pre_load_invalid_key.dts similarity index 86% rename from tools/binman/test/236_pre_load_invalid_key.dts rename to tools/binmanu/test/236_pre_load_invalid_key.dts index df858c3a28b..7b2afde5254 100644 --- a/tools/binman/test/236_pre_load_invalid_key.dts +++ b/tools/binmanu/test/236_pre_load_invalid_key.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa4096"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/230_dev.key"; + key-name = "tools/binmanu/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/237_unique_names.dts b/tools/binmanu/test/237_unique_names.dts similarity index 100% rename from tools/binman/test/237_unique_names.dts rename to tools/binmanu/test/237_unique_names.dts diff --git a/tools/binman/test/238_unique_names_multi.dts b/tools/binmanu/test/238_unique_names_multi.dts similarity index 100% rename from tools/binman/test/238_unique_names_multi.dts rename to tools/binmanu/test/238_unique_names_multi.dts diff --git a/tools/binman/test/239_replace_with_bintool.dts b/tools/binmanu/test/239_replace_with_bintool.dts similarity index 100% rename from tools/binman/test/239_replace_with_bintool.dts rename to tools/binmanu/test/239_replace_with_bintool.dts diff --git a/tools/binman/test/240_fit_extract_replace.dts b/tools/binmanu/test/240_fit_extract_replace.dts similarity index 100% rename from tools/binman/test/240_fit_extract_replace.dts rename to tools/binmanu/test/240_fit_extract_replace.dts diff --git a/tools/binman/test/241_replace_section_simple.dts b/tools/binmanu/test/241_replace_section_simple.dts similarity index 100% rename from tools/binman/test/241_replace_section_simple.dts rename to tools/binmanu/test/241_replace_section_simple.dts diff --git a/tools/binman/test/242_mkimage_name.dts b/tools/binmanu/test/242_mkimage_name.dts similarity index 100% rename from tools/binman/test/242_mkimage_name.dts rename to tools/binmanu/test/242_mkimage_name.dts diff --git a/tools/binman/test/243_mkimage_image.dts b/tools/binmanu/test/243_mkimage_image.dts similarity index 100% rename from tools/binman/test/243_mkimage_image.dts rename to tools/binmanu/test/243_mkimage_image.dts diff --git a/tools/binman/test/244_mkimage_image_no_content.dts b/tools/binmanu/test/244_mkimage_image_no_content.dts similarity index 100% rename from tools/binman/test/244_mkimage_image_no_content.dts rename to tools/binmanu/test/244_mkimage_image_no_content.dts diff --git a/tools/binman/test/245_mkimage_image_bad.dts b/tools/binmanu/test/245_mkimage_image_bad.dts similarity index 100% rename from tools/binman/test/245_mkimage_image_bad.dts rename to tools/binmanu/test/245_mkimage_image_bad.dts diff --git a/tools/binman/test/246_collection_other.dts b/tools/binmanu/test/246_collection_other.dts similarity index 100% rename from tools/binman/test/246_collection_other.dts rename to tools/binmanu/test/246_collection_other.dts diff --git a/tools/binman/test/247_mkimage_coll.dts b/tools/binmanu/test/247_mkimage_coll.dts similarity index 100% rename from tools/binman/test/247_mkimage_coll.dts rename to tools/binmanu/test/247_mkimage_coll.dts diff --git a/tools/binman/test/248_compress_dtb_prepend_invalid.dts b/tools/binmanu/test/248_compress_dtb_prepend_invalid.dts similarity index 100% rename from tools/binman/test/248_compress_dtb_prepend_invalid.dts rename to tools/binmanu/test/248_compress_dtb_prepend_invalid.dts diff --git a/tools/binman/test/249_compress_dtb_prepend_length.dts b/tools/binmanu/test/249_compress_dtb_prepend_length.dts similarity index 100% rename from tools/binman/test/249_compress_dtb_prepend_length.dts rename to tools/binmanu/test/249_compress_dtb_prepend_length.dts diff --git a/tools/binman/test/250_compress_dtb_invalid.dts b/tools/binmanu/test/250_compress_dtb_invalid.dts similarity index 100% rename from tools/binman/test/250_compress_dtb_invalid.dts rename to tools/binmanu/test/250_compress_dtb_invalid.dts diff --git a/tools/binman/test/251_compress_dtb_zstd.dts b/tools/binmanu/test/251_compress_dtb_zstd.dts similarity index 100% rename from tools/binman/test/251_compress_dtb_zstd.dts rename to tools/binmanu/test/251_compress_dtb_zstd.dts diff --git a/tools/binman/test/252_mkimage_mult_data.dts b/tools/binmanu/test/252_mkimage_mult_data.dts similarity index 100% rename from tools/binman/test/252_mkimage_mult_data.dts rename to tools/binmanu/test/252_mkimage_mult_data.dts diff --git a/tools/binman/test/253_mkimage_mult_no_content.dts b/tools/binmanu/test/253_mkimage_mult_no_content.dts similarity index 100% rename from tools/binman/test/253_mkimage_mult_no_content.dts rename to tools/binmanu/test/253_mkimage_mult_no_content.dts diff --git a/tools/binman/test/254_mkimage_filename.dts b/tools/binmanu/test/254_mkimage_filename.dts similarity index 100% rename from tools/binman/test/254_mkimage_filename.dts rename to tools/binmanu/test/254_mkimage_filename.dts diff --git a/tools/binman/test/255_u_boot_vpl.dts b/tools/binmanu/test/255_u_boot_vpl.dts similarity index 100% rename from tools/binman/test/255_u_boot_vpl.dts rename to tools/binmanu/test/255_u_boot_vpl.dts diff --git a/tools/binman/test/256_u_boot_vpl_nodtb.dts b/tools/binmanu/test/256_u_boot_vpl_nodtb.dts similarity index 100% rename from tools/binman/test/256_u_boot_vpl_nodtb.dts rename to tools/binmanu/test/256_u_boot_vpl_nodtb.dts diff --git a/tools/binman/test/257_fdt_incl_vpl.dts b/tools/binmanu/test/257_fdt_incl_vpl.dts similarity index 100% rename from tools/binman/test/257_fdt_incl_vpl.dts rename to tools/binmanu/test/257_fdt_incl_vpl.dts diff --git a/tools/binman/test/258_vpl_bss_pad.dts b/tools/binmanu/test/258_vpl_bss_pad.dts similarity index 100% rename from tools/binman/test/258_vpl_bss_pad.dts rename to tools/binmanu/test/258_vpl_bss_pad.dts diff --git a/tools/binman/test/259_symlink.dts b/tools/binmanu/test/259_symlink.dts similarity index 100% rename from tools/binman/test/259_symlink.dts rename to tools/binmanu/test/259_symlink.dts diff --git a/tools/binman/test/260_symbols_elf.dts b/tools/binmanu/test/260_symbols_elf.dts similarity index 100% rename from tools/binman/test/260_symbols_elf.dts rename to tools/binmanu/test/260_symbols_elf.dts diff --git a/tools/binman/test/261_section_fname.dts b/tools/binmanu/test/261_section_fname.dts similarity index 100% rename from tools/binman/test/261_section_fname.dts rename to tools/binmanu/test/261_section_fname.dts diff --git a/tools/binman/test/262_absent.dts b/tools/binmanu/test/262_absent.dts similarity index 100% rename from tools/binman/test/262_absent.dts rename to tools/binmanu/test/262_absent.dts diff --git a/tools/binman/test/263_tee_os_opt.dts b/tools/binmanu/test/263_tee_os_opt.dts similarity index 100% rename from tools/binman/test/263_tee_os_opt.dts rename to tools/binmanu/test/263_tee_os_opt.dts diff --git a/tools/binman/test/264_tee_os_opt_fit.dts b/tools/binmanu/test/264_tee_os_opt_fit.dts similarity index 100% rename from tools/binman/test/264_tee_os_opt_fit.dts rename to tools/binmanu/test/264_tee_os_opt_fit.dts diff --git a/tools/binman/test/265_tee_os_opt_fit_bad.dts b/tools/binmanu/test/265_tee_os_opt_fit_bad.dts similarity index 100% rename from tools/binman/test/265_tee_os_opt_fit_bad.dts rename to tools/binmanu/test/265_tee_os_opt_fit_bad.dts diff --git a/tools/binman/test/266_blob_ext_opt.dts b/tools/binmanu/test/266_blob_ext_opt.dts similarity index 100% rename from tools/binman/test/266_blob_ext_opt.dts rename to tools/binmanu/test/266_blob_ext_opt.dts diff --git a/tools/binman/test/267_section_inner.dts b/tools/binmanu/test/267_section_inner.dts similarity index 100% rename from tools/binman/test/267_section_inner.dts rename to tools/binmanu/test/267_section_inner.dts diff --git a/tools/binman/test/268_null.dts b/tools/binmanu/test/268_null.dts similarity index 100% rename from tools/binman/test/268_null.dts rename to tools/binmanu/test/268_null.dts diff --git a/tools/binman/test/269_overlap.dts b/tools/binmanu/test/269_overlap.dts similarity index 100% rename from tools/binman/test/269_overlap.dts rename to tools/binmanu/test/269_overlap.dts diff --git a/tools/binman/test/270_overlap_null.dts b/tools/binmanu/test/270_overlap_null.dts similarity index 100% rename from tools/binman/test/270_overlap_null.dts rename to tools/binmanu/test/270_overlap_null.dts diff --git a/tools/binman/test/271_overlap_bad.dts b/tools/binmanu/test/271_overlap_bad.dts similarity index 100% rename from tools/binman/test/271_overlap_bad.dts rename to tools/binmanu/test/271_overlap_bad.dts diff --git a/tools/binman/test/272_overlap_no_size.dts b/tools/binmanu/test/272_overlap_no_size.dts similarity index 100% rename from tools/binman/test/272_overlap_no_size.dts rename to tools/binmanu/test/272_overlap_no_size.dts diff --git a/tools/binman/test/273_blob_symbol.dts b/tools/binmanu/test/273_blob_symbol.dts similarity index 100% rename from tools/binman/test/273_blob_symbol.dts rename to tools/binmanu/test/273_blob_symbol.dts diff --git a/tools/binman/test/274_offset_from_elf.dts b/tools/binmanu/test/274_offset_from_elf.dts similarity index 100% rename from tools/binman/test/274_offset_from_elf.dts rename to tools/binmanu/test/274_offset_from_elf.dts diff --git a/tools/binman/test/275_fit_align.dts b/tools/binmanu/test/275_fit_align.dts similarity index 100% rename from tools/binman/test/275_fit_align.dts rename to tools/binmanu/test/275_fit_align.dts diff --git a/tools/binman/test/276_fit_firmware_loadables.dts b/tools/binmanu/test/276_fit_firmware_loadables.dts similarity index 100% rename from tools/binman/test/276_fit_firmware_loadables.dts rename to tools/binmanu/test/276_fit_firmware_loadables.dts diff --git a/tools/binman/test/Makefile b/tools/binmanu/test/Makefile similarity index 100% rename from tools/binman/test/Makefile rename to tools/binmanu/test/Makefile diff --git a/tools/binman/test/blob_syms.c b/tools/binmanu/test/blob_syms.c similarity index 100% rename from tools/binman/test/blob_syms.c rename to tools/binmanu/test/blob_syms.c diff --git a/tools/binman/test/blob_syms.lds b/tools/binmanu/test/blob_syms.lds similarity index 100% rename from tools/binman/test/blob_syms.lds rename to tools/binmanu/test/blob_syms.lds diff --git a/tools/binman/test/bss_data.c b/tools/binmanu/test/bss_data.c similarity index 100% rename from tools/binman/test/bss_data.c rename to tools/binmanu/test/bss_data.c diff --git a/tools/binman/test/bss_data.lds b/tools/binmanu/test/bss_data.lds similarity index 100% rename from tools/binman/test/bss_data.lds rename to tools/binmanu/test/bss_data.lds diff --git a/tools/binman/test/descriptor.bin b/tools/binmanu/test/descriptor.bin similarity index 100% rename from tools/binman/test/descriptor.bin rename to tools/binmanu/test/descriptor.bin diff --git a/tools/binman/test/elf_sections.c b/tools/binmanu/test/elf_sections.c similarity index 100% rename from tools/binman/test/elf_sections.c rename to tools/binmanu/test/elf_sections.c diff --git a/tools/binman/test/elf_sections.lds b/tools/binmanu/test/elf_sections.lds similarity index 100% rename from tools/binman/test/elf_sections.lds rename to tools/binmanu/test/elf_sections.lds diff --git a/tools/binman/test/embed_data.c b/tools/binmanu/test/embed_data.c similarity index 100% rename from tools/binman/test/embed_data.c rename to tools/binmanu/test/embed_data.c diff --git a/tools/binman/test/embed_data.lds b/tools/binmanu/test/embed_data.lds similarity index 100% rename from tools/binman/test/embed_data.lds rename to tools/binmanu/test/embed_data.lds diff --git a/tools/binman/test/files/1.dat b/tools/binmanu/test/files/1.dat similarity index 100% rename from tools/binman/test/files/1.dat rename to tools/binmanu/test/files/1.dat diff --git a/tools/binman/test/files/2.dat b/tools/binmanu/test/files/2.dat similarity index 100% rename from tools/binman/test/files/2.dat rename to tools/binmanu/test/files/2.dat diff --git a/tools/binman/test/files/ignored_dir.dat/ignore b/tools/binmanu/test/files/ignored_dir.dat/ignore similarity index 100% rename from tools/binman/test/files/ignored_dir.dat/ignore rename to tools/binmanu/test/files/ignored_dir.dat/ignore diff --git a/tools/binman/test/files/not-this-one b/tools/binmanu/test/files/not-this-one similarity index 100% rename from tools/binman/test/files/not-this-one rename to tools/binmanu/test/files/not-this-one diff --git a/tools/binman/test/fitimage.bin.gz b/tools/binmanu/test/fitimage.bin.gz similarity index 100% rename from tools/binman/test/fitimage.bin.gz rename to tools/binmanu/test/fitimage.bin.gz diff --git a/tools/binman/test/generated/autoconf.h b/tools/binmanu/test/generated/autoconf.h similarity index 100% rename from tools/binman/test/generated/autoconf.h rename to tools/binmanu/test/generated/autoconf.h diff --git a/tools/binman/test/ifwi.bin.gz b/tools/binmanu/test/ifwi.bin.gz similarity index 100% rename from tools/binman/test/ifwi.bin.gz rename to tools/binmanu/test/ifwi.bin.gz diff --git a/tools/binman/test/u_boot_binman_embed.c b/tools/binmanu/test/u_boot_binman_embed.c similarity index 100% rename from tools/binman/test/u_boot_binman_embed.c rename to tools/binmanu/test/u_boot_binman_embed.c diff --git a/tools/binman/test/u_boot_binman_embed.lds b/tools/binmanu/test/u_boot_binman_embed.lds similarity index 100% rename from tools/binman/test/u_boot_binman_embed.lds rename to tools/binmanu/test/u_boot_binman_embed.lds diff --git a/tools/binman/test/u_boot_binman_embed_sm.c b/tools/binmanu/test/u_boot_binman_embed_sm.c similarity index 100% rename from tools/binman/test/u_boot_binman_embed_sm.c rename to tools/binmanu/test/u_boot_binman_embed_sm.c diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binmanu/test/u_boot_binman_syms.c similarity index 100% rename from tools/binman/test/u_boot_binman_syms.c rename to tools/binmanu/test/u_boot_binman_syms.c diff --git a/tools/binman/test/u_boot_binman_syms.lds b/tools/binmanu/test/u_boot_binman_syms.lds similarity index 100% rename from tools/binman/test/u_boot_binman_syms.lds rename to tools/binmanu/test/u_boot_binman_syms.lds diff --git a/tools/binman/test/u_boot_binman_syms_bad.c b/tools/binmanu/test/u_boot_binman_syms_bad.c similarity index 100% rename from tools/binman/test/u_boot_binman_syms_bad.c rename to tools/binmanu/test/u_boot_binman_syms_bad.c diff --git a/tools/binman/test/u_boot_binman_syms_bad.lds b/tools/binmanu/test/u_boot_binman_syms_bad.lds similarity index 100% rename from tools/binman/test/u_boot_binman_syms_bad.lds rename to tools/binmanu/test/u_boot_binman_syms_bad.lds diff --git a/tools/binman/test/u_boot_binman_syms_size.c b/tools/binmanu/test/u_boot_binman_syms_size.c similarity index 100% rename from tools/binman/test/u_boot_binman_syms_size.c rename to tools/binmanu/test/u_boot_binman_syms_size.c diff --git a/tools/binman/test/u_boot_binman_syms_x86.c b/tools/binmanu/test/u_boot_binman_syms_x86.c similarity index 100% rename from tools/binman/test/u_boot_binman_syms_x86.c rename to tools/binmanu/test/u_boot_binman_syms_x86.c diff --git a/tools/binman/test/u_boot_binman_syms_x86.lds b/tools/binmanu/test/u_boot_binman_syms_x86.lds similarity index 100% rename from tools/binman/test/u_boot_binman_syms_x86.lds rename to tools/binmanu/test/u_boot_binman_syms_x86.lds diff --git a/tools/binman/test/u_boot_no_ucode_ptr.c b/tools/binmanu/test/u_boot_no_ucode_ptr.c similarity index 100% rename from tools/binman/test/u_boot_no_ucode_ptr.c rename to tools/binmanu/test/u_boot_no_ucode_ptr.c diff --git a/tools/binman/test/u_boot_ucode_ptr.c b/tools/binmanu/test/u_boot_ucode_ptr.c similarity index 100% rename from tools/binman/test/u_boot_ucode_ptr.c rename to tools/binmanu/test/u_boot_ucode_ptr.c diff --git a/tools/binman/test/u_boot_ucode_ptr.lds b/tools/binmanu/test/u_boot_ucode_ptr.lds similarity index 100% rename from tools/binman/test/u_boot_ucode_ptr.lds rename to tools/binmanu/test/u_boot_ucode_ptr.lds diff --git a/tools/u_boot_pylib/tools.py b/tools/u_boot_pylib/tools.py index 187725b5015..e45bb54e447 100644 --- a/tools/u_boot_pylib/tools.py +++ b/tools/u_boot_pylib/tools.py @@ -66,7 +66,7 @@ def prepare_output_dir(dirname, preserve=False): f"Cannot make output directory 'outdir': 'err.strerror'") tout.debug("Using output directory '%s'" % outdir) else: - outdir = tempfile.mkdtemp(prefix='binman.') + outdir = tempfile.mkdtemp(prefix='binmanu.') tout.debug("Using temporary directory '%s'" % outdir)

def _remove_output_dir():