From owner-svn-src-all@freebsd.org Sat Aug 15 21:47:08 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D1659BAEED; Sat, 15 Aug 2015 21:47:08 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1CA01045; Sat, 15 Aug 2015 21:47:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7FLl7nl081652; Sat, 15 Aug 2015 21:47:07 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7FLl7DJ081651; Sat, 15 Aug 2015 21:47:07 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201508152147.t7FLl7DJ081651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Sat, 15 Aug 2015 21:47:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286815 - head/sys/boot/uboot/fdt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2015 21:47:08 -0000 Author: gonzo Date: Sat Aug 15 21:47:07 2015 New Revision: 286815 URL: https://svnweb.freebsd.org/changeset/base/286815 Log: Make dtb file configurable via loader(8) variable. ubldr already checks "fdt_file" and "fdtfile" U-Boot variables. Add one more check for "fdt_file" loader(8) variable. loader(8) variable takes precedence over u-boot env one Modified: head/sys/boot/uboot/fdt/uboot_fdt.c Modified: head/sys/boot/uboot/fdt/uboot_fdt.c ============================================================================== --- head/sys/boot/uboot/fdt/uboot_fdt.c Sat Aug 15 21:46:02 2015 (r286814) +++ head/sys/boot/uboot/fdt/uboot_fdt.c Sat Aug 15 21:47:07 2015 (r286815) @@ -69,10 +69,11 @@ fdt_platform_load_dtb(void) } /* - * If the U-boot environment contains a variable giving the name of a - * file, use it if we can load and validate it. + * Try to get FDT filename first from loader env and then from u-boot env */ - s = ub_env_get("fdtfile"); + s = getenv("fdt_file"); + if (s == NULL) + s = ub_env_get("fdtfile"); if (s == NULL) s = ub_env_get("fdt_file"); if (s != NULL && *s != '\0') {