diff options
| author | Tom Rini <[email protected]> | 2026-01-20 08:31:34 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-20 08:31:34 -0600 |
| commit | a4dc1c3b7d563ac823bf351a656100c3fb2d6424 (patch) | |
| tree | 7044b36a84f95155e860e386bc0b89a752e88227 /cmd | |
| parent | 55ca2110d74f8e5a594aecc11ce4103dc73e9e02 (diff) | |
| parent | 8304f3226700561d219850ee3f542df37373c843 (diff) | |
Merge tag 'efi-2026-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-04-rc1-2
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29050
Documentation:
* Update StarFive JH7110 common description
* Add TI AM62D documentation
* Update urllib3 version for building
* Update links to doc/develop/falcon.rst
* Describe QEMU networking
* kdoc: handle the obsolescensce of docutils.ErrorString()
* Fix typo "addtional" -> "additional" in pflash section.
UEFI:
* Fix boot failure from FIT with compressed EFI binary
Others:
* cmd/meminfo: Correct displaying addresses above 4 GiB
* test:
- Consider configuration in meminfo test
- Consider initf_malloc is only traced with EARLY_TRACE
- Clean up test_trace.py code
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 4 | ||||
| -rw-r--r-- | cmd/meminfo.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 595ac49da41..20df068d55c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -620,7 +620,7 @@ config CMD_SPL help Falcon mode allows booting directly from SPL into an Operating System such as Linux, thus skipping U-Boot proper. See - doc/README.falcon for full information about how to use this + doc/develop/falcon.rst for full information about how to use this command. config CMD_SPL_NAND_OFS @@ -629,7 +629,7 @@ config CMD_SPL_NAND_OFS default 0x0 help This provides the offset of the command line arguments for Linux - when booting from NAND in Falcon mode. See doc/README.falcon + when booting from NAND in Falcon mode. See doc/develop/falcon.rst for full information about how to use this option (and also see board/gateworks/gw_ventana/README for an example). diff --git a/cmd/meminfo.c b/cmd/meminfo.c index aa3b5bafe17..b731280d106 100644 --- a/cmd/meminfo.c +++ b/cmd/meminfo.c @@ -23,9 +23,9 @@ static void print_region(const char *name, ulong base, ulong size, ulong *uptop) { ulong end = base + size; - printf("%-12s %8lx %8lx %8lx", name, base, size, end); + printf("%-12s %13lx %13lx %13lx", name, base, size, end); if (*uptop) - printf(" %8lx", *uptop - end); + printf(" %13lx", *uptop - end); putc('\n'); *uptop = base; } @@ -64,9 +64,9 @@ static int do_meminfo(struct cmd_tbl *cmdtp, int flag, int argc, arch_dump_mem_attrs(); - printf("\n%-12s %8s %8s %8s %8s\n", "Region", "Base", "Size", "End", + printf("\n%-12s %13s %13s %13s %13s\n", "Region", "Base", "Size", "End", "Gap"); - printf("------------------------------------------------\n"); + printf("--------------------------------------------------------------------\n"); upto = 0; if (IS_ENABLED(CONFIG_VIDEO)) print_region("video", gd_video_bottom(), |