Merge git://git.denx.de/u-boot-dm

2015-10-27 19:08:19 -04:00
parent c139b5ff09 4ea5243a3a
commit 2431492aef
47 changed files with 209 additions and 257 deletions
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -449,6 +449,9 @@ static int initr_env(void)
 		env_relocate();
 	else
 		set_default_env(NULL);
+#ifdef CONFIG_OF_CONTROL
+	setenv_addr("fdtcontroladdr", gd->fdt_blob);
+#endif

 	/* Initialize from environment */
 	load_addr = getenv_ulong("loadaddr", 16, load_addr);