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

2016-10-13 20:03:33 -04:00
parent 44afdc4a12 42b7600d62
commit 4504062b27
38 changed files with 299 additions and 222 deletions
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -602,7 +602,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 	char baseboard_name[16];
 	int err;

-	fdt_shrink_to_minimum(blob); /* Make room for new properties */
+	fdt_shrink_to_minimum(blob, 0); /* Make room for new properties */

 	/* MAC addr */
 	if (eth_getenv_enetaddr("ethaddr", enetaddr)) {