diff mbox

[U-Boot,4/7] pxe: support linux entries for labels

Message ID 1332949898-6502-5-git-send-email-robherring2@gmail.com
State Accepted
Commit beb9f6c6789edaf0ab20d4105b80299a92f6fdb9
Delegated to: Joe Hershberger
Headers show

Commit Message

Rob Herring March 28, 2012, 3:51 p.m. UTC 
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(-)

Comments

Wolfgang Denk June 21, 2012, 8:35 p.m. UTC | #1 
Dear Rob Herring,

In message <1332949898-6502-5-git-send-email-robherring2@gmail.com> you wrote:
> 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(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

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;