Revert "of: Fix premature bootconsole disable with 'stdout-path'"
This reverts commit 2fa645cb27
.
The assumption that at least 1 preferred console will be registered
when the stdout-path property is set is invalid, which can result
in _no_ consoles.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
parent
721a09e95c
commit
f64255b507
|
@ -1888,10 +1888,8 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
|
|||
name = of_get_property(of_chosen, "linux,stdout-path", NULL);
|
||||
if (IS_ENABLED(CONFIG_PPC) && !name)
|
||||
name = of_get_property(of_aliases, "stdout", NULL);
|
||||
if (name) {
|
||||
if (name)
|
||||
of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
|
||||
add_preferred_console("stdout-path", 0, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
if (!of_aliases)
|
||||
|
|
Loading…
Reference in New Issue