From 93d278a447956d0ec62c23215d1998cadd4c5f09 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 21 Apr 2014 12:07:23 -0500 Subject: [PATCH 04/14] 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. --- common/cmd_pxe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 3483328..9c43e63 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 = ""; -- 1.9.0