summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-12-02 21:00:26 -0600
committerJoe Hershberger <joe.hershberger@ni.com>2013-06-24 19:07:34 -0500
commit32d2ffe7316b39fbeb38525e9445601cb39276fd (patch)
tree5532b2d30b176e76f8c32104dc1529d774dae3bd /common
parente82eeb57091ea5ed9a25ece50e911cb8e3dd623d (diff)
pxe: simplify menu display and selection
Menus with lots of entries and long append lines are hard to read. Just show a numbered list using the label or name and make the choice by entering the number. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_pxe.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 6e3fcb2402..079d226581 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -429,6 +429,7 @@ static int get_relfile_envaddr(const char *file_path, const char *envaddr_name)
* list - lets these form a list, which a pxe_menu struct will hold.
*/
struct pxe_label {
+ char num[4];
char *name;
char *menu;
char *kernel;
@@ -518,21 +519,9 @@ static void label_destroy(struct pxe_label *label)
static void label_print(void *data)
{
struct pxe_label *label = data;
- const char *c = label->menu ? label->menu : label->kernel;
+ const char *c = label->menu ? label->menu : label->name;
- printf("%s:\t%s\n", label->name, c);
-
- if (label->kernel)
- printf("\t\tkernel: %s\n", label->kernel);
-
- if (label->append)
- printf("\t\tappend: %s\n", label->append);
-
- if (label->initrd)
- printf("\t\tinitrd: %s\n", label->initrd);
-
- if (label->fdt)
- printf("\tfdt: %s\n", label->fdt);
+ printf("%s:\t%s\n", label->num, c);
}
/*
@@ -619,8 +608,10 @@ static int label_boot(struct pxe_label *label)
return 1;
}
- if (label->append)
+ if (label->append) {
setenv("bootargs", label->append);
+ printf("append: %s\n", label->append);
+ }
bootm_argv[1] = getenv("kernel_addr_r");
@@ -1268,6 +1259,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg)
struct list_head *pos;
struct menu *m;
int err;
+ int i = 1;
+ char *default_num = NULL;
/*
* Create a menu and add items for all the labels.
@@ -1281,18 +1274,23 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg)
list_for_each(pos, &cfg->labels) {
label = list_entry(pos, struct pxe_label, list);
- if (menu_item_add(m, label->name, label) != 1) {
+ sprintf(label->num, "%d", i++);
+ if (menu_item_add(m, label->num, label) != 1) {
menu_destroy(m);
return NULL;
}
+ if (cfg->default_label &&
+ (strcmp(label->name, cfg->default_label) == 0))
+ default_num = label->num;
+
}
/*
* After we've created items for each label in the menu, set the
* menu's default label if one was specified.
*/
- if (cfg->default_label) {
- err = menu_default_set(m, cfg->default_label);
+ if (default_num) {
+ err = menu_default_set(m, default_num);
if (err != 1) {
if (err != -ENOENT) {
menu_destroy(m);