diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-03-28 05:51:35 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-21 22:35:00 +0200 |
| commit | beb9f6c6789edaf0ab20d4105b80299a92f6fdb9 (patch) | |
| tree | 6d317341b5b963728b96d1f39eb31f511c803bcf /common/cmd_pxe.c | |
| parent | 7815c4e89fbf2ce91c740a7aa110f1ff7b35b8ed (diff) | |
| download | talos-obmc-uboot-beb9f6c6789edaf0ab20d4105b80299a92f6fdb9.tar.gz talos-obmc-uboot-beb9f6c6789edaf0ab20d4105b80299a92f6fdb9.zip | |
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>
Diffstat (limited to 'common/cmd_pxe.c')
| -rw-r--r-- | common/cmd_pxe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 9b4f0e0e06..e05af0cee3 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; |
