diff options
author | marcel <marcel@FreeBSD.org> | 2011-01-17 23:34:36 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2011-01-17 23:34:36 +0000 |
commit | f5a8d0767612894229f3e6e68fd7eaac1c0029cd (patch) | |
tree | 6d6f7cfc79eec8bd71f807d87c6459650b07e71d /sys/dev/uart/uart_bus_fdt.c | |
parent | c94e91a673f89baeb7a70bfcc32758ff464b582d (diff) | |
download | FreeBSD-src-f5a8d0767612894229f3e6e68fd7eaac1c0029cd.zip FreeBSD-src-f5a8d0767612894229f3e6e68fd7eaac1c0029cd.tar.gz |
Check the environment for system devices before using the FDT.
This allows overriding the FDT, and allows specifying a debug
port.
Diffstat (limited to 'sys/dev/uart/uart_bus_fdt.c')
-rw-r--r-- | sys/dev/uart/uart_bus_fdt.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c index 27809ce..f8204b1 100644 --- a/sys/dev/uart/uart_bus_fdt.c +++ b/sys/dev/uart/uart_bus_fdt.c @@ -140,6 +140,15 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) u_long start, size; int err; + uart_bus_space_mem = fdtbus_bs_tag; + uart_bus_space_io = NULL; + + /* Allow overriding the FDT uning the environment. */ + class = &uart_ns8250_class; + err = uart_getenv(devtype, di, class); + if (!err) + return (0); + if (devtype != UART_DEV_CONSOLE) return (ENXIO); @@ -183,18 +192,12 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; - di->bas.bst = fdtbus_bs_tag; + di->bas.bst = uart_bus_space_mem; err = fdt_regsize(node, &start, &size); if (err) return (ENXIO); start += fdt_immr_va; - uart_bus_space_mem = fdtbus_bs_tag; - uart_bus_space_io = NULL; - - if (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh) != 0) - return (ENXIO); - - return (0); + return (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh)); } |