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') {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
