diff mbox

[U-Boot,2/2] fdt_support: Don't panic if unable to perform stdout fixup

Message ID 1441073150-15143-2-git-send-email-scottwood@freescale.com
State Superseded
Headers show

Commit Message

Scott Wood Sept. 1, 2015, 2:05 a.m. UTC 
Currently, using fdt_fixup_stdout() on a device tree that is missing
the relevant alias results in this:

WARNING: could not set linux,stdout-path FDT_ERR_NOTFOUND.
ERROR: /chosen node create failed
 - must RESET the board to recover.

FDT creation failed! hanging...### ERROR ### Please RESET the board ###

There is no reason for this to be a fatal error rather than a warning,
and removing this allows for a smooth transition on a platform where
the device tree currently lacks the correct aliases but will have them
in the future.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Simon Glass <sgj@chromium.org>
---
 common/fdt_support.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/common/fdt_support.c b/common/fdt_support.c
index f86365e..6052c77 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -308,7 +308,8 @@  int fdt_chosen(void *fdt)
 		}
 	}
 
-	return fdt_fixup_stdout(fdt, nodeoffset);
+	fdt_fixup_stdout(fdt, nodeoffset);
+	return 0;
 }
 
 void do_fixup_by_path(void *fdt, const char *path, const char *prop,