]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
pxe: support linux entries for labels
authorRob Herring <rob.herring@calxeda.com>
Wed, 28 Mar 2012 05:51:35 +0000 (05:51 +0000)
committerWolfgang Denk <wd@denx.de>
Thu, 21 Jun 2012 20:35:00 +0000 (22:35 +0200)
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>
common/cmd_pxe.c

index 9b4f0e0e06ef3524be9423fc8da99524b294a264..e05af0cee331927ba99d2dccd75f3211e2d5501b 100644 (file)
@@ -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;