From 4bcb3897fa0f93577ece1485419ac70b60974495 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 1 Nov 2013 15:00:33 +0100 Subject: boot: Print boot entries in the order they are Instead of first printing the traditional entries and the bootloader spec entries afterwards. Signed-off-by: Sascha Hauer --- commands/boot.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'commands') diff --git a/commands/boot.c b/commands/boot.c index f2d983684c..21623655ed 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -132,25 +132,15 @@ static void bootsources_list(void) blspec = bootentries_collect(); - printf("\nBootscripts:\n\n"); - printf("%-40s %-20s\n", "name", "title"); - printf("%-40s %-20s\n", "----", "-----"); + printf("%-20s %-20s %s\n", "device", "hwdevice", "title"); + printf("%-20s %-20s %s\n", "------", "--------", "-----"); blspec_for_each_entry(blspec, entry) { if (entry->scriptpath) printf("%-40s %s\n", basename(entry->scriptpath), entry->me.display); - } - - if (!IS_ENABLED(CONFIG_BLSPEC)) - return; - - printf("\nBootloader spec entries:\n\n"); - printf("%-20s %-20s %s\n", "device", "hwdevice", "title"); - printf("%-20s %-20s %s\n", "------", "--------", "-----"); - - blspec_for_each_entry(blspec, entry) - if (!entry->scriptpath) + else printf("%s\n", entry->me.display); + } blspec_free(blspec); } -- cgit v1.2.3