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 /test/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 'test/cmd')
| -rw-r--r-- | test/cmd/meminfo.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/test/cmd/meminfo.c b/test/cmd/meminfo.c index 40c3520496e..d91fa6fcead 100644 --- a/test/cmd/meminfo.c +++ b/test/cmd/meminfo.c @@ -15,24 +15,34 @@ static int cmd_test_meminfo(struct unit_test_state *uts) { ut_assertok(run_command("meminfo", 0)); ut_assert_nextlinen("DRAM: "); + + if (!IS_ENABLED(CMD_MEMINFO_MAP)) + return 0; + ut_assert_nextline_empty(); - ut_assert_nextline("Region Base Size End Gap"); + ut_assert_nextline("Region Base Size End Gap"); ut_assert_nextlinen("-"); /* For now we don't worry about checking the values */ - ut_assert_nextlinen("video"); + if (IS_ENABLED(CONFIG_VIDEO)) + ut_assert_nextlinen("video"); + if (IS_ENABLED(CONFIG_TRACE)) + ut_assert_nextlinen("trace"); ut_assert_nextlinen("code"); ut_assert_nextlinen("malloc"); ut_assert_nextlinen("board_info"); ut_assert_nextlinen("global_data"); ut_assert_nextlinen("devicetree"); - ut_assert_nextlinen("bootstage"); - ut_assert_nextlinen("bloblist"); + if (IS_ENABLED(CONFIG_BOOTSTAGE)) + ut_assert_nextlinen("bootstage"); + if (IS_ENABLED(CONFIG_BLOBLIST)) + ut_assert_nextlinen("bloblist"); ut_assert_nextlinen("stack"); /* we expect at least one lmb line, but don't know how many */ - ut_assert_nextlinen("lmb"); + if (IS_ENABLED(CONFIG_LMB)) + ut_assert_nextlinen("lmb"); ut_assert_skip_to_linen("free"); ut_assert_console_end(); |