From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Fri, 21 Mar 2014 14:49:08 -0400 Subject: [U-Boot] [PATCH 6/6] pxe: additionaly check for fdt_file env variable In-Reply-To: <1395353581-5839-7-git-send-email-dennis@ausil.us> References: <1392659798-1665-1-git-send-email-dennis@ausil.us> <1395353581-5839-1-git-send-email-dennis@ausil.us> <1395353581-5839-7-git-send-email-dennis@ausil.us> Message-ID: <20140321184908.GR16360@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, Mar 20, 2014 at 05:13:01PM -0500, Dennis Gilmore wrote: > 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. > > Signed-off-by: Dennis Gilmore > --- > common/cmd_pxe.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c > index 3483328..c58e471 100644 > --- a/common/cmd_pxe.c > +++ b/common/cmd_pxe.c > @@ -712,6 +712,13 @@ 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. > + */ Correctly wrap this please, thanks. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: