The usage of the LMB library and the device-tree source are not related. Remove the dependency in the bdinfo output and adjust the unit test.
Reviewed-by: Ilias Apalodimas <[email protected]> Signed-off-by: Heinrich Schuchardt <[email protected]> --- v2: correct typo 'adjuste' in commit message --- cmd/bdinfo.c | 9 +++++---- test/cmd/bdinfo.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 20c8c97f0cd..8e2bbfa9c20 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -160,11 +160,12 @@ static int bdinfo_print_all(struct bd_info *bd) #if CONFIG_IS_ENABLED(MULTI_DTB_FIT) bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit); #endif - if (IS_ENABLED(CONFIG_LMB) && gd->fdt_blob) { + if (IS_ENABLED(CONFIG_LMB)) lmb_dump_all_force(); - if (IS_ENABLED(CONFIG_OF_REAL)) - printf("devicetree = %s\n", fdtdec_get_srcname()); - } + + if (IS_ENABLED(CONFIG_OF_REAL) && gd->fdt_blob) + printf("devicetree = %s\n", fdtdec_get_srcname()); + print_serial(gd->cur_serial_dev); if (IS_ENABLED(CONFIG_CMD_BDINFO_EXTRA)) { diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 2b4866a172e..3005c85d4a0 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -191,11 +191,11 @@ static int bdinfo_test_all(struct unit_test_state *uts) ut_assertok(test_num_l(uts, "multi_dtb_fit", (ulong)gd->multi_dtb_fit)); #endif - if (IS_ENABLED(CONFIG_LMB) && gd->fdt_blob) { + if (IS_ENABLED(CONFIG_LMB)) ut_assertok(lmb_test_dump_all(uts)); - if (IS_ENABLED(CONFIG_OF_REAL)) - ut_assert_nextline("devicetree = %s", fdtdec_get_srcname()); - } + + if (IS_ENABLED(CONFIG_OF_REAL) && gd->fdt_blob) + ut_assert_nextline("devicetree = %s", fdtdec_get_srcname()); if (IS_ENABLED(CONFIG_DM_SERIAL)) { struct serial_device_info info; -- 2.51.0
