diff mbox

[U-Boot,v2] pxe: support include files at top-level

Message ID 1337978596-7769-1-git-send-email-robherring2@gmail.com
State Accepted
Commit 1e08522699fcfe906692024a839fd4a5fc7749f5
Delegated to: Joe Hershberger
Headers show

Commit Message

Rob Herring May 25, 2012, 8:43 p.m. UTC 
From: Rob Herring <rob.herring@calxeda.com>

Include files outside of a menu were not getting included and parsed.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
v2:
- ensure include file load address is aligned

 common/cmd_pxe.c |    5 +++++
 1 file changed, 5 insertions(+)

Comments

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

In message <1337978596-7769-1-git-send-email-robherring2@gmail.com> you wrote:
> From: Rob Herring <rob.herring@calxeda.com>
> 
> Include files outside of a menu were not getting included and parsed.
> 
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> ---
> v2:
> - ensure include file load address is aligned
> 
>  common/cmd_pxe.c |    5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index b3c1f67..5949b24 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -1110,6 +1110,11 @@  static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level)
 
 			break;
 
+		case T_INCLUDE:
+			err = handle_include(&p, b + ALIGN(strlen(b), 4), cfg,
+							nest_level + 1);
+			break;
+
 		case T_PROMPT:
 			err = parse_integer(&p, &cfg->prompt);
 			break;