Hi Tom,

I am bringing in the binman changes now. There are going to be some minor tweaks to templating as well as various patches from others, but most are based on these patches.

https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/16964

The following changes since commit 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c:

Merge tag 'efi-2023-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-07-20 10:19:04 -0400)

are available in the Git repository at:

git://git.denx.de/u-boot-dm.git tags/dm-pull-20jul23

for you to fetch changes up to 24142ead21ed5e4d2d6f39dd410d91d815ea1ae2:

binman: Reduce state.SetInt and bintool cmd to debug level (2023-07-20 14:10:58 -0600)

---------------------------------------------------------------- binman mkimage and template enhancements misc fixes

---------------------------------------------------------------- Eugen Hristev (1): dm: core: of_access: fix return value in of_property_match_string

Heinrich Schuchardt (1): cmd: fix loads, saves on sandbox

John Clark (1): bootstd: USB devtype detection for script boot

John Keeping (1): core: read: fix dev_read_addr_size()

Marek Vasut (1): binman: Convert mkimage to Entry_section

Maxim Cournoyer (2): tools: Fix README file in pyproject.toml of u_boot_pylib. tools: Fix package discovery in pyproject.toml of u_boot_pylib.

Sergei Antonov (1): sandbox: fix a compilation error

Simon Glass (18): binman: Init align_default in entry_Section binman: Use GetEntries() to obtain section contents binman: Read _multiple_data_files in the correct place binman: Allow disabling symbol writing stm32mp15: Avoid writing symbols in SPL binman: Update elf to return number of written symbols binman: Add more detail on how ObtainContents() works binman: Provide a way to specify the fdt-list directly binman: Drop __bss_size variable in bss_data.c binman: Correct handling of zero bss size dtoc: Support copying the contents of a node into another dtoc: Allow inserting a list of nodes into another binman: Support simple templates binman: Support templating with multiple images binman: Add a test for templating in a FIT binman: Support templates at any level binman: Support writing symbols inside a mkimage image binman: Reduce state.SetInt and bintool cmd to debug level

arch/arm/dts/stm32mp15-u-boot.dtsi | 1 + arch/sandbox/include/asm/sdl.h | 23 +++++++ arch/sandbox/include/asm/test.h | 25 ------- boot/bootmeth_script.c | 5 +- cmd/load.c | 16 +++-- drivers/core/of_access.c | 5 +- drivers/core/read.c | 5 +- drivers/reset/reset-rockchip.c | 2 +- include/dm/read.h | 12 +--- test/dm/video.c | 1 + tools/binman/binman.rst | 94 +++++++++++++++++++++++++++ tools/binman/bintool.py | 2 +- tools/binman/control.py | 32 ++++++++- tools/binman/elf.py | 13 +++- tools/binman/elf_test.py | 13 +++- tools/binman/entries.rst | 6 ++ tools/binman/entry.py | 11 ++-- tools/binman/etype/blob_phase.py | 5 ++ tools/binman/etype/fit.py | 9 +++ tools/binman/etype/mkimage.py | 136 +++++++++++++++++++-------------------- tools/binman/etype/section.py | 54 ++++++++++++---- tools/binman/etype/u_boot_spl_bss_pad.py | 2 +- tools/binman/etype/u_boot_tpl_bss_pad.py | 2 +- tools/binman/etype/u_boot_vpl_bss_pad.py | 2 +- tools/binman/ftest.py | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tools/binman/state.py | 4 +- tools/binman/test/282_symbols_disable.dts | 25 +++++++ tools/binman/test/283_mkimage_special.dts | 24 +++++++ tools/binman/test/284_fit_fdt_list.dts | 58 +++++++++++++++++ tools/binman/test/285_spl_expand.dts | 13 ++++ tools/binman/test/286_template.dts | 42 ++++++++++++ tools/binman/test/287_template_multi.dts | 27 ++++++++ tools/binman/test/288_template_fit.dts | 37 +++++++++++ tools/binman/test/289_template_section.dts | 52 +++++++++++++++ tools/binman/test/290_mkimage_sym.dts | 27 ++++++++ tools/binman/test/Makefile | 5 +- tools/binman/test/bss_data.c | 3 +- tools/binman/test/bss_data_zero.c | 16 +++++ tools/binman/test/bss_data_zero.lds | 15 +++++ tools/binman/test/embed_data.lds | 1 + tools/dtoc/fdt.py | 141 +++++++++++++++++++++++++++++++++++++++- tools/dtoc/test/dtoc_test_copy.dts | 88 +++++++++++++++++++++++++ tools/dtoc/test_fdt.py | 113 ++++++++++++++++++++++++++++++++ tools/u_boot_pylib/pyproject.toml | 6 +- 44 files changed, 1238 insertions(+), 153 deletions(-) create mode 100644 tools/binman/test/282_symbols_disable.dts create mode 100644 tools/binman/test/283_mkimage_special.dts create mode 100644 tools/binman/test/284_fit_fdt_list.dts create mode 100644 tools/binman/test/285_spl_expand.dts create mode 100644 tools/binman/test/286_template.dts create mode 100644 tools/binman/test/287_template_multi.dts create mode 100644 tools/binman/test/288_template_fit.dts create mode 100644 tools/binman/test/289_template_section.dts create mode 100644 tools/binman/test/290_mkimage_sym.dts create mode 100644 tools/binman/test/bss_data_zero.c create mode 100644 tools/binman/test/bss_data_zero.lds create mode 100644 tools/dtoc/test/dtoc_test_copy.dts

Regards, SImon