summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-11-01 15:00:33 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-11-05 08:37:55 +0100
commit4bcb3897fa0f93577ece1485419ac70b60974495 (patch)
treeea7c35af46615071e10af43d8a17f25c4f93a26e /commands
parent21af7e0005ab6e4be353ade885f0864e48414bc5 (diff)
downloadbarebox-4bcb3897fa0f93577ece1485419ac70b60974495.tar.gz
barebox-4bcb3897fa0f93577ece1485419ac70b60974495.tar.xz
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 <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/boot.c18
1 files changed, 4 insertions, 14 deletions
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);
}