From 90e4f3dd4c451e5e288bcbe1638740dc5f0323df Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 20 Oct 2022 21:11:30 -0600 Subject: [PATCH] util/cbmem: Update formatting for cbmem -l command Some of the cbmem area names have gotten longer, and were making the output of cbmem -l look bad, so expand the name area to 20 characters. Instead of printing a blank area if the name isn't recognized, call it unknown. Change the method of printing the title to match the way the actual text of the table is printed. Signed-off-by: Martin Roth Change-Id: I9d91d21c6ad418d9fee9880550fb6cb9e41e93f0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/68644 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner Reviewed-by: Eric Lai --- util/cbmem/cbmem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index c537a7ae66..b1c2f89515 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -1185,11 +1185,10 @@ static void cbmem_print_entry(int n, uint32_t id, uint64_t base, uint64_t size) printf("%2d. ", n); if (name == NULL) - printf("\t\t%08x", id); - else - printf("%s\t%08x", name, id); + name = "(unknown)"; + printf("%-20s %08x", name, id); printf(" %08" PRIx64 " ", base); - printf(" %08" PRIx64 "\n", size); + printf(" %08" PRIx64 "\n", size); } static void dump_cbmem_toc(void) @@ -1204,7 +1203,8 @@ static void dump_cbmem_toc(void) return; printf("CBMEM table of contents:\n"); - printf(" NAME ID START LENGTH\n"); + printf(" %-20s %-8s %-8s %-8s\n", "NAME", "ID", "START", + "LENGTH"); i = 0; offset = 0;