All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Herring <robherring2@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/7] pxe: support linux entries for labels
Date: Wed, 28 Mar 2012 10:51:35 -0500	[thread overview]
Message-ID: <1332949898-6502-5-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1332949898-6502-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

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 |    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

  parent reply	other threads:[~2012-03-28 15:51 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-28 15:51 [U-Boot] [PATCH 0/7] PXE parsing fixes and local file support Rob Herring
2012-03-28 15:51 ` [U-Boot] [PATCH 1/7] menu: only timeout when menu is displayed Rob Herring
2012-06-21 20:34   ` Wolfgang Denk
2012-03-28 15:51 ` [U-Boot] [PATCH 2/7] pxe: support include files at top-level Rob Herring
2012-05-25 20:43   ` [U-Boot] [PATCH v2] " Rob Herring
2012-06-21 20:34     ` Wolfgang Denk
2012-03-28 15:51 ` [U-Boot] [PATCH 3/7] pxe: add support for label menu text Rob Herring
2012-06-21 20:34   ` Wolfgang Denk
2012-03-28 15:51 ` Rob Herring [this message]
2012-06-21 20:35   ` [U-Boot] [PATCH 4/7] pxe: support linux entries for labels Wolfgang Denk
2012-03-28 15:51 ` [U-Boot] [PATCH 5/7] pxe: support absolute paths Rob Herring
2012-06-21 20:35   ` Wolfgang Denk
2012-03-28 15:51 ` [U-Boot] [PATCH 6/7] pxe: parse initrd file from append string Rob Herring
2012-06-21 20:35   ` Wolfgang Denk
2012-03-28 15:51 ` [U-Boot] [PATCH 7/7] pxe: add support for parsing local syslinux files Rob Herring
2012-05-23 22:11   ` Joe Hershberger
2012-05-23 22:57     ` Rob Herring
2012-05-23 23:02       ` Joe Hershberger
2012-05-25 18:56         ` Joe Hershberger
2012-05-25 20:47   ` [U-Boot] [PATCH v2] " Rob Herring
2012-05-25 21:44     ` Joe Hershberger
2012-06-21 20:36     ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332949898-6502-5-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.