From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Wed, 28 Mar 2012 10:51:35 -0500 Subject: [U-Boot] [PATCH 4/7] pxe: support linux entries for labels In-Reply-To: <1332949898-6502-1-git-send-email-robherring2@gmail.com> References: <1332949898-6502-1-git-send-email-robherring2@gmail.com> Message-ID: <1332949898-6502-5-git-send-email-robherring2@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Rob Herring 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 --- 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 2497b73..b8cb4f3 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; -- 1.7.5.4