projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
common
/
fdt_support.c
diff --git
a/common/fdt_support.c
b/common/fdt_support.c
index
a3f7442
..
b9dce99
100644
(file)
--- a/
common/fdt_support.c
+++ b/
common/fdt_support.c
@@
-402,10
+402,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");
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));
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"));
}
err = fdt_setprop(blob, nodeoffset, "device_type", "memory",
sizeof("memory"));