This series includes a number of minor improvements to binman, including:
- Dropping some test Elf files and building them from source instead - Refactoring of x86 16-bit entries - Support for SPL symbols within sections - Handle the 'notes' sections and hidden symbols in recent binutils - Improved error reporting with a tool fails
Simon Glass (34): patman: Drop binary parameter patman: Update command.Run() to handle failure better binman: Use cls instead of self for class methods binman: Allow use of help and entry-docs without libfdt binman: Drop .note section from ELF binman: Handle hidden symbols in ELF files binman: Correct use of 'replace' in IFWI tests binman: Add support for an x86 'reset' section binman: x86: Separate out 16-bit reset and init code binman: Add support for Intel FIT binman: Fix IFWI output when using an Intel FIT image binman: Use tools.Run() to run objdump binman: Use the Makefile to build ELF test files binman: Use the Makefile for u_boot_ucode_ptr binman: Use the Makefile for u_boot_no_ucode_ptr binman: Use the Makefile for u_boot_binman_syms binman: Use the Makefile for u_boot_binman_syms_size binman: Use the Makefile for u_boot_binman_syms_bad binman: Clean up unnecessary code related to ELF test files binman: Allow symbols to be resolved inside sections binman: Use underscore in test filenames binman: Rename some two-digit test files binman: Avoid needing the section size in advance binman: Increase size of TPL and SPL test data binman: Allow support for writing a size symbol to binaries binman: Correct symbol calculation with non-zero image base binman: Add support for Intel FSP meminit binman: Fix entry comment for Intel descriptor binman: Update IFWI entry to read entries outside constructor binman: Update IFWI entry to support updates binman: Support writing symbols into entries within an IFWI binman: Write symbol info before image inclusion binman: Add logging for the number of pack passes binman: Drop comment-out code in testUpdateFdtOutput()
Makefile | 10 +- arch/x86/dts/u-boot.dtsi | 9 + scripts/Makefile.spl | 22 +- tools/binman/README.entries | 136 ++++++++-- tools/binman/control.py | 13 +- tools/binman/elf.py | 11 +- tools/binman/elf_test.py | 57 ++++- tools/binman/entry.py | 5 +- tools/binman/etype/blob.py | 1 - tools/binman/etype/blob_dtb.py | 6 +- tools/binman/etype/cbfs.py | 5 +- tools/binman/etype/fdtmap.py | 13 +- tools/binman/etype/files.py | 5 +- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/etype/intel_fit.py | 32 +++ tools/binman/etype/intel_fit_ptr.py | 41 +++ tools/binman/etype/intel_fsp_m.py | 27 ++ tools/binman/etype/intel_ifwi.py | 68 +++-- tools/binman/etype/section.py | 16 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 5 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/x86_reset16.py | 29 +++ tools/binman/etype/x86_reset16_spl.py | 29 +++ tools/binman/etype/x86_reset16_tpl.py | 29 +++ tools/binman/etype/x86_start16.py | 15 +- tools/binman/etype/x86_start16_spl.py | 19 +- tools/binman/etype/x86_start16_tpl.py | 18 +- tools/binman/ftest.py | 241 ++++++++++++------ tools/binman/test/021_image_pad.dts | 2 +- tools/binman/test/024_sorted.dts | 2 +- tools/binman/test/028_pack_4gb_outside.dts | 2 +- .../test/{029_x86-rom.dts => 029_x86_rom.dts} | 2 +- ...no-desc.dts => 030_x86_rom_me_no_desc.dts} | 0 ...{031_x86-rom-me.dts => 031_x86_rom_me.dts} | 0 .../{032_intel-vga.dts => 032_intel_vga.dts} | 0 ...33_x86-start16.dts => 033_x86_start16.dts} | 0 .../{042_intel-fsp.dts => 042_intel_fsp.dts} | 0 .../{043_intel-cmc.dts => 043_intel_cmc.dts} | 0 .../{046_intel-vbt.dts => 046_intel_vbt.dts} | 0 ...tart16-spl.dts => 048_x86_start16_spl.dts} | 0 tools/binman/test/053_symbols.dts | 2 +- ...tart16-tpl.dts => 081_x86_start16_tpl.dts} | 0 ...=> 098_4gb_and_skip_at_start_together.dts} | 0 ..._x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} | 2 +- ...nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} | 2 +- ...nodata.dts => 113_x86_rom_ifwi_nodata.dts} | 2 +- tools/binman/test/144_x86_reset16.dts | 13 + tools/binman/test/145_x86_reset16_spl.dts | 13 + tools/binman/test/146_x86_reset16_tpl.dts | 13 + tools/binman/test/147_intel_fit.dts | 20 ++ tools/binman/test/148_intel_fit_missing.dts | 17 ++ tools/binman/test/149_symbols_tpl.dts | 28 ++ ...> 150_powerpc_mpc85xx_bootpg_resetvec.dts} | 0 .../binman/test/151_x86_rom_ifwi_section.dts | 33 +++ tools/binman/test/152_intel_fsp_m.dts | 14 + tools/binman/test/Makefile | 14 +- tools/binman/test/bss_data | Bin 5020 -> 0 bytes tools/binman/test/u_boot_binman_syms | Bin 4924 -> 0 bytes tools/binman/test/u_boot_binman_syms.c | 1 + tools/binman/test/u_boot_binman_syms.lds | 3 +- tools/binman/test/u_boot_binman_syms_bad | Bin 4890 -> 0 bytes tools/binman/test/u_boot_binman_syms_size | Bin 4825 -> 0 bytes tools/binman/test/u_boot_no_ucode_ptr | Bin 4182 -> 0 bytes tools/binman/test/u_boot_ucode_ptr | Bin 4175 -> 0 bytes tools/binman/test/u_boot_ucode_ptr.lds | 3 +- tools/patman/cros_subprocess.py | 3 +- tools/patman/tools.py | 23 +- 68 files changed, 870 insertions(+), 212 deletions(-) create mode 100644 tools/binman/etype/intel_fit.py create mode 100644 tools/binman/etype/intel_fit_ptr.py create mode 100644 tools/binman/etype/intel_fsp_m.py create mode 100644 tools/binman/etype/x86_reset16.py create mode 100644 tools/binman/etype/x86_reset16_spl.py create mode 100644 tools/binman/etype/x86_reset16_tpl.py rename tools/binman/test/{029_x86-rom.dts => 029_x86_rom.dts} (87%) rename tools/binman/test/{030_x86-rom-me-no-desc.dts => 030_x86_rom_me_no_desc.dts} (100%) rename tools/binman/test/{031_x86-rom-me.dts => 031_x86_rom_me.dts} (100%) rename tools/binman/test/{032_intel-vga.dts => 032_intel_vga.dts} (100%) rename tools/binman/test/{033_x86-start16.dts => 033_x86_start16.dts} (100%) rename tools/binman/test/{042_intel-fsp.dts => 042_intel_fsp.dts} (100%) rename tools/binman/test/{043_intel-cmc.dts => 043_intel_cmc.dts} (100%) rename tools/binman/test/{046_intel-vbt.dts => 046_intel_vbt.dts} (100%) rename tools/binman/test/{048_x86-start16-spl.dts => 048_x86_start16_spl.dts} (100%) rename tools/binman/test/{081_x86-start16-tpl.dts => 081_x86_start16_tpl.dts} (100%) rename tools/binman/test/{80_4gb_and_skip_at_start_together.dts => 098_4gb_and_skip_at_start_together.dts} (100%) rename tools/binman/test/{111_x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} (95%) rename tools/binman/test/{112_x86-rom-ifwi-nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} (95%) rename tools/binman/test/{113_x86-rom-ifwi-nodata.dts => 113_x86_rom_ifwi_nodata.dts} (95%) create mode 100644 tools/binman/test/144_x86_reset16.dts create mode 100644 tools/binman/test/145_x86_reset16_spl.dts create mode 100644 tools/binman/test/146_x86_reset16_tpl.dts create mode 100644 tools/binman/test/147_intel_fit.dts create mode 100644 tools/binman/test/148_intel_fit_missing.dts create mode 100644 tools/binman/test/149_symbols_tpl.dts rename tools/binman/test/{81_powerpc_mpc85xx_bootpg_resetvec.dts => 150_powerpc_mpc85xx_bootpg_resetvec.dts} (100%) create mode 100644 tools/binman/test/151_x86_rom_ifwi_section.dts create mode 100644 tools/binman/test/152_intel_fsp_m.dts delete mode 100755 tools/binman/test/bss_data delete mode 100755 tools/binman/test/u_boot_binman_syms delete mode 100755 tools/binman/test/u_boot_binman_syms_bad delete mode 100755 tools/binman/test/u_boot_binman_syms_size delete mode 100755 tools/binman/test/u_boot_no_ucode_ptr delete mode 100755 tools/binman/test/u_boot_ucode_ptr