From: Rob Herring <rob.herring@calxeda.com>
Date: Wed, 28 Mar 2012 05:51:35 +0000 (+0000)
Subject: pxe: support linux entries for labels
X-Git-Tag: v2012.07-rc1~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=beb9f6c6789edaf0ab20d4105b80299a92f6fdb9;p=platform%2Fkernel%2Fu-boot.git

pxe: support linux entries for labels

Kernels can be specified using "linux" or "kernel" entry. The difference
is kernel is supposed to detect the type of file, but for u-boot both are
treated the same.

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

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 9b4f0e0..e05af0c 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -628,6 +628,7 @@ enum token_type {
 	T_TIMEOUT,
 	T_LABEL,
 	T_KERNEL,
+	T_LINUX,
 	T_APPEND,
 	T_INITRD,
 	T_LOCALBOOT,
@@ -656,6 +657,7 @@ static const struct token keywords[] = {
 	{"prompt", T_PROMPT},
 	{"label", T_LABEL},
 	{"kernel", T_KERNEL},
+	{"linux", T_LINUX},
 	{"localboot", T_LOCALBOOT},
 	{"append", T_APPEND},
 	{"initrd", T_INITRD},
@@ -1024,6 +1026,7 @@ static int parse_label(char **c, struct pxe_menu *cfg)
 			break;
 
 		case T_KERNEL:
+		case T_LINUX:
 			err = parse_sliteral(c, &label->kernel);
 			break;