From: Rob Herring <rob.herring@calxeda.com>
Date: Wed, 28 Mar 2012 05:51:34 +0000 (+0000)
Subject: pxe: add support for label menu text
X-Git-Tag: v2012.07-rc1~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7815c4e89fbf2ce91c740a7aa110f1ff7b35b8ed;p=u-boot

pxe: add support for label menu text

Use a menu string if present, otherwise use the kernel string.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 5949b247cb..9b4f0e0e06 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -409,6 +409,7 @@ static int get_relfile_envaddr(char *file_path, char *envaddr_name)
  */
 struct pxe_label {
 	char *name;
+	char *menu;
 	char *kernel;
 	char *append;
 	char *initrd;
@@ -491,17 +492,18 @@ 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;
 
-	printf("Label: %s\n", label->name);
+	printf("%s:\t%s\n", label->name, c);
 
 	if (label->kernel)
-		printf("\tkernel: %s\n", label->kernel);
+		printf("\t\tkernel: %s\n", label->kernel);
 
 	if (label->append)
-		printf("\tappend: %s\n", label->append);
+		printf("\t\tappend: %s\n", label->append);
 
 	if (label->initrd)
-		printf("\tinitrd: %s\n", label->initrd);
+		printf("\t\tinitrd: %s\n", label->initrd);
 }
 
 /*
@@ -969,6 +971,9 @@ static int parse_label_menu(char **c, struct pxe_menu *cfg,
 		if (!cfg->default_label)
 			return -ENOMEM;
 
+		break;
+	case T_LABEL:
+		parse_sliteral(c, &label->menu);
 		break;
 	default:
 		printf("Ignoring malformed menu command: %.*s\n",