diff options
author | Tom Rini <trini@konsulko.com> | 2019-12-03 18:12:04 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-12-03 18:12:04 -0500 |
commit | a7bbaf8c1345906affb8dd6faa6a3aaedac3f451 (patch) | |
tree | 063f153aefc407b1baa14c5835c97ebeb546df5f /drivers/serial | |
parent | 2ae43a26405498fcaaec2132db82a2487ad6747b (diff) | |
parent | 151f275e0562a0dcb7b6745131753f968e12b9f0 (diff) | |
download | u-boot-a7bbaf8c1345906affb8dd6faa6a3aaedac3f451.zip u-boot-a7bbaf8c1345906affb8dd6faa6a3aaedac3f451.tar.gz u-boot-a7bbaf8c1345906affb8dd6faa6a3aaedac3f451.tar.bz2 |
Merge tag 'dm-pull-3dec19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
Fix stdout-path handling
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial-uclass.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index dcdaede..0f5f1fa 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -29,29 +29,31 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE; #if CONFIG_IS_ENABLED(SERIAL_PRESENT) static int serial_check_stdout(const void *blob, struct udevice **devp) { - int node; + int node = -1; + const char *str, *p, *name; + int namelen; /* Check for a chosen console */ - node = fdtdec_get_chosen_node(blob, "stdout-path"); - if (node < 0) { - const char *str, *p, *name; - - /* - * Deal with things like - * stdout-path = "serial0:115200n8"; - * - * We need to look up the alias and then follow it to the - * correct node. - */ - str = fdtdec_get_chosen_prop(blob, "stdout-path"); - if (str) { - p = strchr(str, ':'); - name = fdt_get_alias_namelen(blob, str, - p ? p - str : strlen(str)); + str = fdtdec_get_chosen_prop(blob, "stdout-path"); + if (str) { + p = strchr(str, ':'); + namelen = p ? p - str : strlen(str); + node = fdt_path_offset_namelen(blob, str, namelen); + + if (node < 0) { + /* + * Deal with things like + * stdout-path = "serial0:115200n8"; + * + * We need to look up the alias and then follow it to + * the correct node. + */ + name = fdt_get_alias_namelen(blob, str, namelen); if (name) node = fdt_path_offset(blob, name); } } + if (node < 0) node = fdt_path_offset(blob, "console"); if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, devp)) |