Commit 2fa645cb authored Mar 01, 2015 by Peter Hurley Committed by Rob Herring Mar 10, 2015

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



Support for devicetree serial consoles via 'stdout-path' causes
bootconsoles to be disabled when the vt dummy console loads, since
there is no preferred console (the preferred console is not added
until the device is probed).

Ensure there is at least a preferred console, even if never matched.

Requires: "console: Fix console name size mismatch"
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Rob Herring <robh@kernel.org>

parent 2c192699

drivers/of/base.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1886,8 +1886,10 @@ 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)

Admin message