Commit f64255b5 authored Mar 17, 2015 by Peter Hurley Committed by Rob Herring Mar 19, 2015

Revert "of: Fix premature bootconsole disable with 'stdout-path'"



This reverts commit 2fa645cb.

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>

parent 721a09e9

drivers/of/base.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)