diff options
author | Dennis Gilmore <dennis@ausil.us> | 2014-04-21 12:07:23 -0500 |
---|---|---|
committer | Dennis Gilmore <dennis@ausil.us> | 2014-04-25 17:08:01 -0500 |
commit | d96ac74e4d59c4dfbd70420b22d47dd6927a585e (patch) | |
tree | 4148ece867dff7f526063aa8c4b5df69924e4d84 | |
parent | 598c3e06f09b85e8eceac86e4d1df6c65491c662 (diff) | |
download | u-boot-d96ac74e4d59c4dfbd70420b22d47dd6927a585e.tar.gz u-boot-d96ac74e4d59c4dfbd70420b22d47dd6927a585e.tar.xz u-boot-d96ac74e4d59c4dfbd70420b22d47dd6927a585e.zip |
pxe: additionaly check for fdt_file env variable
some boards have used fdt_file while others have used fdtfile to
define the name of the fdt file. If we do notget a fdtfile environment
variable, additionally check for fdt_file.
-rw-r--r-- | common/cmd_pxe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 348332874b..9c43e63da8 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -712,6 +712,12 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char *f1, *f2, *f3, *f4, *slash; f1 = getenv("fdtfile"); + /* + * some boards have used fdt_file as the environment variable for + * defining the device tree file so lets check for fdt_file also. + */ + if (!f1) + f1 = getenv("fdt_file"); if (f1) { f2 = ""; f3 = ""; |