projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8594753
)
pxe: support include files at top-level
author
Rob Herring
<rob.herring@calxeda.com>
Fri, 25 May 2012 10:43:16 +0000
(10:43 +0000)
committer
Wolfgang Denk
<wd@denx.de>
Thu, 21 Jun 2012 20:34:26 +0000
(22:34 +0200)
Include files outside of a menu were not getting included and parsed.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
common/cmd_pxe.c
patch
|
blob
|
history
diff --git
a/common/cmd_pxe.c
b/common/cmd_pxe.c
index b3c1f67a33022c1ad5ec21781e07d3aba76e616c..5949b247cbaadf54760c9c0dee483123a39897dc 100644
(file)
--- 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;