From: Tom Rini Date: Wed, 22 Jan 2025 22:08:34 +0000 (-0600) Subject: Merge patch series "upl: Prerequite patches for updated spec" X-Git-Tag: v2025.04-rc1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe;p=thirdparty%2Fu-boot.git Merge patch series "upl: Prerequite patches for updated spec" Simon Glass 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 --- a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe diff --cc configs/chromebook_bob_defconfig index 5e67de3bd85,072311465d9..1b018ef4d7c --- a/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 b4f7e61ad0d,b1999b4ef20..93e3355219b --- a/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_FIXED=y -CONFIG_BLOBLIST_ADDR=0x100000 -CONFIG_BLOBLIST_SIZE=0x30000 +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 0be6e4462dd,13c0998dbab..1ee0c0e6c9d --- a/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