svn commit: r278736 - stable/10/sys/boot/fdt

[Ian Lepore]

Author: ian
Date: Fri Feb 13 23:43:59 2015
New Revision: 278736
URL: https://svnweb.freebsd.org/changeset/base/278736

Log:
  MFC r278032:
  
    Do not skip setting the memory 'reg' property if the fdt data already
    contains one.

Modified:
  stable/10/sys/boot/fdt/fdt_loader_cmd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/fdt/fdt_loader_cmd.c
==============================================================================
--- stable/10/sys/boot/fdt/fdt_loader_cmd.c	Fri Feb 13 23:37:56 2015	(r278735)
+++ stable/10/sys/boot/fdt/fdt_loader_cmd.c	Fri Feb 13 23:43:59 2015	(r278736)
@@ -566,17 +566,6 @@ fdt_fixup_memory(struct fdt_mem_region *
 		return;
 	}
 
-	if ((reg = (uint32_t *)fdt_getprop(fdtp, memory, "reg",
-	    &len)) != NULL) {
-
-		if (fdt_reg_valid(reg, len, addr_cells, size_cells) == 0)
-			/*
-			 * Do not apply fixup if existing 'reg' property
-			 * seems to be valid.
-			 */
-			return;
-	}
-
 	len = (addr_cells + size_cells) * realmrno * sizeof(uint32_t);
 	sb = buf = (uint8_t *)malloc(len);
 	if (!buf)