aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-03-28 05:51:35 +0000
committerJohn Rigby <john.rigby@linaro.org>2012-07-20 20:33:23 -0600
commita0854adedf77a3214616d7a2b21a8eff117ae8a0 (patch)
tree29a7aca58e055f78345ecc59a2e8301198ec1ac9
parente539d117b58a208c2c3b768427453c3429e29d18 (diff)
downloadu-boot-linaro-stable-a0854adedf77a3214616d7a2b21a8eff117ae8a0.tar.gz
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>
-rw-r--r--common/cmd_pxe.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 04094aa7b..946466e9d 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -631,6 +631,7 @@ enum token_type {
T_TIMEOUT,
T_LABEL,
T_KERNEL,
+ T_LINUX,
T_APPEND,
T_INITRD,
T_LOCALBOOT,
@@ -659,6 +660,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},
@@ -1027,6 +1029,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;