Hi Tom, This is for the -next branch.
https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/6944 I hope this one will be easier as it has changes that are more run-of-the mill. The following changes since commit 9c7335e4e68355a96bd5a411b2a5f85866823c58: Merge tag 'dm-pull-26mar21-take2' of git://git.denx.de/u-boot-dm into next (2021-03-26 12:15:26 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-28mar21 for you to fetch changes up to e5021221db3faf7e90a295d6eb045fbf5c6a908b: sandbox: define __dyn_sym_start, dyn_sym_end (2021-03-27 16:26:48 +1300) ---------------------------------------------------------------- binman support for expanding entries, connections misc fixes and improvements to sandbox, etc. x86 CBFS improvements x86 coreboot improvements ---------------------------------------------------------------- Heinrich Schuchardt (2): mtd: spi_flash_free() sandbox: define __dyn_sym_start, dyn_sym_end Simon Glass (66): x86: coral: Free the ACPI GPIOs after using them x86: coral: Add information about building / running x86: p2sb: Drop LOG_DEBUG x86: Probe device if needed in intel_gpio_xlate() x86: coral: Put the eMMC first x86: coral: Update the SD card-detect GPIO tegra: i2c: Drop LOG_DEBUG mmc: pci_mmc: Set up the card detect cbfs: Add support for attributes cbfs: Rename new_node to node smbios: Allow writing to the coreboot version string cbfs: Allow access to CBFS without a header cbfs: Allow file traversal with any CBFS cbfs: Factor out filling a cache node into a new function cbfs: Simplify file iteration cbfs: Support reading compression information cbfs: Drop unnecessary cast in file_cbfs_fill_cache() x86: Make coreboot sysinfo available to any x86 board x86: Move coreboot timestamp info into coreboot_tables.h x86: coreboot: Sync up timestamp codes x86: Move coreboot sysinfo parsing into generic x86 code x86: coreboot: Update parsing of the latest sysinfo x86: Allow installing an e820 when booting from coreboot x86: Add a command to display coreboot sysinfo cmd: Add missing check for CONFIG_SYS_LONGHELP video: Fix video on coreboot with the copy buffer x86: video: Allow coreboot video to be used on any x86 board x86: fsp: Don't enable FSP graphics if booted from coreboot dm: core: Add CBFS support to flashmap x86: coral: Avoid build error with !CONFIG_ACPIGEN x86: coral: Allow init of debug UART in U-Boot proper x86: coral: Fall back to coreboot video when FSP missing x86: fsp: Don't notify if booted from coreboot x86: coreboot: Don't setup MTRR when booting from coreboot sandbox: Only call timer_timebase_fallback() if present sandbox: Only delete the executable if requested sandbox: cros_ec: Only write EC state when the EC is probed sandbox: Disintangle declarations in do_host_bind() sandbox: Update do_host_bind() argument counting sandbox: Provide a way to bind fixed/removeable devices sandbox: image: Allow sandbox to load any image test: Silenece the echo and print tests binman: Show a message when changing subnodes spl: Split out bootstage ID into a function bootstage: Warning if space is exhausted sf: Support querying write-protect cpu: Rename SPL_CPU_SUPPORT to SPL_CPU malloc: Export malloc_simple_info() doc: Convert Chromium OS docs to rst command: Fix operation of !CONFIG_CMDLINE bloblist: Make BLOBLIST_TABLES depend on BLOBLIST bootm: Skip command-line substitution if !CONFIG_CMDLINE sandbox: Correct uninit conflict sysinfo: Allow showing model info from sysinfo x86: coral: Show memory config and SKU ID on startup binman: Use a unique number for the symbols test file binman: Allow disabling expanding an entry binman: Add support for a collection of entries binman: Support obtaining section contents immediately binman: Support default alignment for sections dtoc: Improve internal error for Refresh() dtoc: Tidy up property-offset handling dtoc: Tweak ordering of fdt-offsets refreshing dtoc: Add a subnode test for multiple nodes dtoc: Support adding subnodes alongside existing ones dtoc: Add new check that offsets are correct T Karthik Reddy (1): spi: spi-uclass: Add support to manually relocate spi memory ops Vincent Stehlé (1): sandbox: dtsi: add rng arch/riscv/cpu/ax25/Kconfig | 2 +- arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/generic/Kconfig | 2 +- arch/sandbox/cpu/cpu.c | 6 +- arch/sandbox/cpu/os.c | 24 +- arch/sandbox/cpu/u-boot.lds | 7 + arch/sandbox/dts/sandbox.dtsi | 4 + arch/x86/Kconfig | 21 ++ arch/x86/cpu/apollolake/cpu.c | 14 +- arch/x86/cpu/apollolake/cpu_common.c | 60 +++++ arch/x86/cpu/apollolake/cpu_spl.c | 58 ---- arch/x86/cpu/coreboot/Makefile | 1 - arch/x86/cpu/coreboot/coreboot.c | 2 +- arch/x86/cpu/coreboot/sdram.c | 29 +- arch/x86/cpu/coreboot/tables.c | 255 ------------------ arch/x86/cpu/coreboot/timestamp.c | 14 +- arch/x86/cpu/start_from_spl.S | 4 + arch/x86/dts/chromebook_coral.dts | 19 +- arch/x86/include/asm/arch-apollolake/uart.h | 1 + arch/x86/include/asm/arch-coreboot/sysinfo.h | 62 ----- arch/x86/include/asm/arch-coreboot/timestamp.h | 25 +- arch/x86/include/asm/cb_sysinfo.h | 220 ++++++++++++++++ arch/x86/include/asm/coreboot_tables.h | 261 +++++++++++++++--- arch/x86/include/asm/e820.h | 16 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/bootm.c | 2 +- arch/x86/lib/coreboot/Makefile | 7 + arch/x86/lib/coreboot/cb_support.c | 41 +++ arch/x86/lib/coreboot/cb_sysinfo.c | 468 +++++++++++++++++++++++++++++++++ arch/x86/lib/fsp/fsp_graphics.c | 2 +- arch/x86/lib/fsp2/fsp_init.c | 3 +- arch/x86/lib/fsp2/fsp_support.c | 4 + arch/x86/lib/init_helpers.c | 6 +- arch/x86/lib/spl.c | 2 +- arch/x86/lib/zimage.c | 13 +- board/coreboot/coreboot/coreboot.c | 2 +- board/google/chromebook_coral/coral.c | 141 +++++++++- board/google/chromebook_coral/variant_gpio.h | 6 - cmd/Kconfig | 9 + cmd/acpi.c | 2 + cmd/bloblist.c | 2 + cmd/host.c | 35 ++- cmd/version.c | 2 +- cmd/x86/Makefile | 1 + cmd/x86/cbsysinfo.c | 394 +++++++++++++++++++++++++++ common/board_info.c | 37 ++- common/bootm.c | 3 +- common/bootstage.c | 18 +- common/image-fit.c | 4 + common/spl/Kconfig | 2 +- common/spl/spl.c | 23 +- configs/chromebook_coral_defconfig | 2 +- configs/chromebook_link64_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- doc/arch/sandbox.rst | 2 + doc/board/google/chromebook_coral.rst | 234 +++++++++++++++-- doc/{README.chromium-chainload => chromium/chainload.rst} | 80 +++--- doc/chromium/{ => files}/chromebook_jerry.its | 0 doc/chromium/{ => files}/devkeys/kernel.keyblock | Bin doc/chromium/{ => files}/devkeys/kernel_data_key.vbprivk | Bin doc/chromium/{ => files}/nyan-big.its | 0 doc/chromium/index.rst | 14 + doc/chromium/overview.rst | 74 ++++++ doc/{README.chromium => chromium/run_vboot.rst} | 90 +++---- doc/device-tree-bindings/sysinfo/google,coral.txt | 37 +++ doc/index.rst | 8 + doc/usage/index.rst | 1 + doc/usage/x86/cbsysinfo.rst | 25 ++ drivers/Makefile | 2 +- drivers/block/sandbox.c | 8 +- drivers/gpio/intel_gpio.c | 14 +- drivers/misc/cbmem_console.c | 2 +- drivers/misc/cros_ec_sandbox.c | 4 + drivers/misc/p2sb_emul.c | 1 - drivers/mmc/pci_mmc.c | 6 +- drivers/mtd/spi/sf-uclass.c | 14 +- drivers/mtd/spi/sf_internal.h | 4 + drivers/mtd/spi/sf_probe.c | 8 + drivers/mtd/spi/spi-nor-core.c | 11 + drivers/mtd/spi/spi-nor-tiny.c | 6 + drivers/pci/pci_rom.c | 7 +- drivers/serial/serial_coreboot.c | 2 +- drivers/sound/tegra_i2s.c | 1 - drivers/spi/spi-uclass.c | 11 + drivers/timer/sandbox_timer.c | 3 +- drivers/timer/timer-uclass.c | 6 +- drivers/video/Kconfig | 2 +- drivers/video/coreboot.c | 18 +- fs/cbfs/cbfs.c | 124 ++++++--- include/cbfs.h | 77 +++++- include/command.h | 10 +- include/configs/chromebook_coral.h | 6 +- include/dm/of_extra.h | 8 + include/image.h | 5 + include/malloc.h | 3 +- include/sandboxblockdev.h | 9 +- include/smbios.h | 20 ++ include/spi_flash.h | 31 ++- include/sysinfo.h | 4 + lib/Kconfig | 2 +- lib/binman.c | 4 +- lib/smbios-parser.c | 38 +++ lib/smbios.c | 4 - test/cmd/test_echo.c | 3 +- test/dm/sf.c | 10 +- test/lib/test_print.c | 8 +- tools/binman/binman.rst | 14 + tools/binman/entries.rst | 21 +- tools/binman/entry.py | 16 +- tools/binman/etype/cbfs.py | 1 + tools/binman/etype/collection.py | 67 +++++ tools/binman/etype/mkimage.py | 1 + tools/binman/etype/section.py | 36 ++- tools/binman/etype/u_boot.py | 2 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/vblock.py | 36 +-- tools/binman/ftest.py | 57 +++- tools/binman/test/{192_symbols_nodtb.dts => 196_symbols_nodtb.dts} | 0 tools/binman/test/197_symbols_expand.dts | 23 ++ tools/binman/test/198_collection.dts | 27 ++ tools/binman/test/199_collection_section.dts | 32 +++ tools/binman/test/200_align_default.dts | 30 +++ tools/dtoc/fdt.py | 92 +++++-- tools/dtoc/test/dtoc_test_simple.dts | 4 + tools/dtoc/test_fdt.py | 76 +++++- 126 files changed, 3133 insertions(+), 812 deletions(-) delete mode 100644 arch/x86/cpu/coreboot/tables.c delete mode 100644 arch/x86/include/asm/arch-coreboot/sysinfo.h create mode 100644 arch/x86/include/asm/cb_sysinfo.h create mode 100644 arch/x86/lib/coreboot/Makefile create mode 100644 arch/x86/lib/coreboot/cb_support.c create mode 100644 arch/x86/lib/coreboot/cb_sysinfo.c create mode 100644 cmd/x86/cbsysinfo.c rename doc/{README.chromium-chainload => chromium/chainload.rst} (79%) rename doc/chromium/{ => files}/chromebook_jerry.its (100%) rename doc/chromium/{ => files}/devkeys/kernel.keyblock (100%) rename doc/chromium/{ => files}/devkeys/kernel_data_key.vbprivk (100%) rename doc/chromium/{ => files}/nyan-big.its (100%) create mode 100644 doc/chromium/index.rst create mode 100644 doc/chromium/overview.rst rename doc/{README.chromium => chromium/run_vboot.rst} (68%) create mode 100644 doc/device-tree-bindings/sysinfo/google,coral.txt create mode 100644 doc/usage/x86/cbsysinfo.rst create mode 100644 tools/binman/etype/collection.py rename tools/binman/test/{192_symbols_nodtb.dts => 196_symbols_nodtb.dts} (100%) create mode 100644 tools/binman/test/197_symbols_expand.dts create mode 100644 tools/binman/test/198_collection.dts create mode 100644 tools/binman/test/199_collection_section.dts create mode 100644 tools/binman/test/200_align_default.dts Regards, Simon
