diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-22 16:08:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-22 17:08:47 -0600 |
| commit | a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe (patch) | |
| tree | bf148f9145392c695ffb623ef8c307a4a3fe8e82 /cmd | |
| parent | 2eed5a1ff36217372e19f7513bd07077fc76718a (diff) | |
| parent | 8985ff56b16dc6c04da2c96d48e7f6f54d04e3ff (diff) | |
| download | u-boot-a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe.tar.gz | |
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
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 4 | ||||
| -rw-r--r-- | cmd/ximg.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 2a5a77f0064..d00e743db36 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -900,14 +900,14 @@ config MD5SUM_VERIFY config CMD_MEMINFO bool "meminfo" - default y if SANDBOX + default y if SANDBOX || X86 help Display memory information. config CMD_MEMINFO_MAP bool "- with memory map" depends on CMD_MEMINFO - default y if SANDBOX + default y if SANDBOX || X86 help Shows a memory map, in addition to just the DRAM size. This allows seeing where U-Boot's memory area is, at the top of DRAM, as well as diff --git a/cmd/ximg.c b/cmd/ximg.c index 1c96f5a0a1f..29d7c3279b3 100644 --- a/cmd/ximg.c +++ b/cmd/ximg.c @@ -161,8 +161,7 @@ do_imgextract(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } /* get subimage/external data address and length */ - if (fit_image_get_data_and_size(fit_hdr, noffset, - &fit_data, &fit_len)) { + if (fit_image_get_data(fit_hdr, noffset, &fit_data, &fit_len)) { puts("Could not find script subimage data\n"); return 1; } |