Merge patch series "upl: Prerequite patches for updated spec"

Simon Glass <sjg@chromium.org> says:

The current UPL spec[1] has been tidied up and improved over the last
year, since U-Boot's original UPL support was written.

This series includes some prerequisite patches needed for the real UPL
patches. It is split from [2]

[1] https://github.com/UniversalPayload/spec/tree/3f1450d
[2] https://patchwork.ozlabs.org/project/uboot/list/?series=438574&state=*

Link: https://lore.kernel.org/r/20250111000029.245022-1-sjg@chromium.org

diff --cc boot/image-board.c
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc configs/chromebook_bob_defconfig
index 5e67de3,0723114..1b018ef
--- 1/configs/chromebook_bob_defconfig
--- 2/configs/chromebook_bob_defconfig
+++ b/configs/chromebook_bob_defconfig
@@@ -23,10 -36,10 +23,11 @@@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk339
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_BOARD_EARLY_INIT_R=y
  CONFIG_BLOBLIST=y
 +# CONFIG_TPL_BLOBLIST is not set
+ CONFIG_BLOBLIST_FIXED=y
  CONFIG_BLOBLIST_ADDR=0x100000
  CONFIG_BLOBLIST_SIZE=0x1000
 -CONFIG_SPL_MAX_SIZE=0x1e000
 +CONFIG_SPL_MAX_SIZE=0x40000
  CONFIG_SPL_PAD_TO=0x7f8000
  CONFIG_HANDOFF=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set

diff --cc configs/chromebook_coral_defconfig
index b4f7e61,b1999b4..93e3355
--- 1/configs/chromebook_coral_defconfig
--- 2/configs/chromebook_coral_defconfig
+++ b/configs/chromebook_coral_defconfig
@@@ -45,8 -44,9 +45,9 @@@ CONFIG_LOGF_FUNC=
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_BLOBLIST=y
  # CONFIG_TPL_BLOBLIST is not set
 -CONFIG_BLOBLIST_ADDR=0x100000
 -CONFIG_BLOBLIST_SIZE=0x30000
+ CONFIG_BLOBLIST_FIXED=y
 +CONFIG_BLOBLIST_ADDR=0xfef10000
 +CONFIG_BLOBLIST_SIZE=0x1000
  CONFIG_SPL_NO_BSS_LIMIT=y
  CONFIG_HANDOFF=y
  CONFIG_SPL_SEPARATE_BSS=y
@@@ -128,4 -128,4 +129,3 @@@ CONFIG_GENERATE_ACPI_TABLE=
  CONFIG_CMD_DHRYSTONE=y
  CONFIG_TPM=y
  # CONFIG_GZIP is not set
--CONFIG_BLOBLIST_TABLES=y

diff --cc configs/chromebook_kevin_defconfig
index 0be6e44,13c0998..1ee0c0e
--- 1/configs/chromebook_kevin_defconfig
--- 2/configs/chromebook_kevin_defconfig
+++ b/configs/chromebook_kevin_defconfig
@@@ -24,10 -37,10 +24,11 @@@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk339
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_BOARD_EARLY_INIT_R=y
  CONFIG_BLOBLIST=y
 +# CONFIG_TPL_BLOBLIST is not set
+ CONFIG_BLOBLIST_FIXED=y
  CONFIG_BLOBLIST_ADDR=0x100000
  CONFIG_BLOBLIST_SIZE=0x1000
 -CONFIG_SPL_MAX_SIZE=0x1e000
 +CONFIG_SPL_MAX_SIZE=0x40000
  CONFIG_SPL_PAD_TO=0x7f8000
  CONFIG_HANDOFF=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set

diff --cc configs/qemu_arm64_defconfig
Simple merge

diff --cc include/image.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc tools/image-host.c
Simple merge