diff options
author | Stefan Reinauer <reinauer@chromium.org> | 2011-08-24 14:02:24 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 12:28:31 -0700 |
commit | a0fc3d569ad6f695852599e34c6f4245120ea8bf (patch) | |
tree | 8e8b3cd3715a89bdb07840ac557cb51108eb0ce1 | |
parent | c648159d0a01b32d61da555c9b42c75bddcab62b (diff) |
Fix IO UART selection from device tree
and also change address from 3f8 to i3f8 to clarify that it's an IO
address.
BUG=none
TEST=boot coreboot on stumpy, see serial console output contain u-boot
messages.
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Change-Id: Ib876e2812f05ded28de458ab2c38451ce85aed19
Reviewed-on: http://gerrit.chromium.org/gerrit/6606
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
-rw-r--r-- | board/chromebook-x86/coreboot/iouart.dtsi | 4 | ||||
-rw-r--r-- | common/fdt_decode.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/chromebook-x86/coreboot/iouart.dtsi b/board/chromebook-x86/coreboot/iouart.dtsi index 2f299ff4634..ac455a9a029 100644 --- a/board/chromebook-x86/coreboot/iouart.dtsi +++ b/board/chromebook-x86/coreboot/iouart.dtsi @@ -2,10 +2,10 @@ /{ aliases { - console = "/serial@3f8"; + console = "/serial@i3f8"; }; - serial@3f8 { + serial@i3f8 { compatible = "ns16550"; reg = <0x3f8 0x08>; id = <1>; diff --git a/common/fdt_decode.c b/common/fdt_decode.c index e2e92eccbe3..df267e4e00c 100644 --- a/common/fdt_decode.c +++ b/common/fdt_decode.c @@ -282,7 +282,7 @@ int fdt_decode_uart_console(const void *blob, struct fdt_uart *uart, uart->enabled = get_is_enabled(blob, node, 1); uart->interrupt = get_int(blob, node, "interrupts", -1); uart->silent = fdt_decode_get_config_int(blob, "silent_console", 0); - uart->io_mapped = fdt_decode_get_config_int(blob, "io-mapped", 0); + uart->io_mapped = get_int(blob, node, "io-mapped", 0); uart->compat = fdt_decode_lookup(blob, node); /* Calculate divisor if required */ |