Message ID | 1385632300-23206-4-git-send-email-miao.yan@windriver.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Thu, Nov 28, 2013 at 05:51:39PM +0800, miao.yan@windriver.com wrote: > From: Miao Yan <miao.yan@windriver.com> > > fdt_fixup_memory_banks() will add and update /memory node in > device tree blob. In the case that /memory node doesn't exist, > after adding a new one, this function returns error. > > The correct behavior should be continuing to update its properties. > > Signed-off-by: Miao Yan <miao.yan@windriver.com> Applied to u-boot/master, thanks!
diff --git a/common/fdt_support.c b/common/fdt_support.c index 1f0d8f5..4e32b02 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -400,10 +400,11 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) nodeoffset = fdt_path_offset(blob, "/memory"); if (nodeoffset < 0) { nodeoffset = fdt_add_subnode(blob, 0, "memory"); - if (nodeoffset < 0) + if (nodeoffset < 0) { printf("WARNING: could not create /memory: %s.\n", fdt_strerror(nodeoffset)); - return nodeoffset; + return nodeoffset; + } } err = fdt_setprop(blob, nodeoffset, "device_type", "memory", sizeof("memory"));