summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-07-20 15:35:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-07-26 08:31:35 +0200
commitff6bc088015606f8b272c694c2a622a006d702e3 (patch)
tree0a16fefca7f2fb6a86fb3feb010e4138e3c2fe48 /common
parent0d054f330377d64e994b93c842f447b4a00b3169 (diff)
downloadbarebox-ff6bc088015606f8b272c694c2a622a006d702e3.tar.gz
barebox-ff6bc088015606f8b272c694c2a622a006d702e3.tar.xz
bootentries: Add title/description
We currently have to special case blspec entries vs. boot scripts in the common boot code since we want to print different informations about them. This adds a 'title' and 'description' which can be filled in with different information by bootscripts and blspec entries and so we get rid of the special handling. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r--common/blspec.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/common/blspec.c b/common/blspec.c
index d1597f9f7e..dff0928fd2 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -409,11 +409,10 @@ int blspec_scan_directory(struct bootentries *bootentries, const char *root)
hwdevname = xstrdup(dev_name(entry->cdev->dev->parent));
}
- entry->entry.me.display = basprintf("%-20s %-20s %s",
- devname ? devname : "",
- hwdevname ? hwdevname : "",
- blspec_entry_var_get(entry, "title"));
-
+ entry->entry.title = xstrdup(blspec_entry_var_get(entry, "title"));
+ entry->entry.description = basprintf("blspec entry, device: %s hwdevice: %s",
+ devname ? devname : "none",
+ hwdevname ? hwdevname : "none");
free(devname);
free(hwdevname);