On Sun, Mar 1, 2015 at 11:21 AM, Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
Applied for 4.0. Thanks.
Rob
> ---
> drivers/of/base.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 36536b6..83dc8a6 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1885,8 +1885,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)
> --
> 2.3.0
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
