diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2019-04-30 20:04:32 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2019-04-30 20:04:32 +0000 |
| commit | a1bbf26e8c7d960e36a40c58f98771a2d4c00b0c (patch) | |
| tree | 5dfea0fbb8e437ded3d3051e27b31c52c9b88ae4 /sys/arch | |
| parent | a142075c541df0f22494af0a74d3139f6a9b6b20 (diff) | |
Add mvuart(4) to support the Armada 3720's serial console.
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/RAMDISK | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c index 1ac2e03c4b7..80ad0271875 100644 --- a/sys/arch/arm64/arm64/machdep.c +++ b/sys/arch/arm64/arm64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.38 2019/04/01 07:00:51 tedu Exp $ */ +/* $OpenBSD: machdep.c,v 1.39 2019/04/30 20:04:31 patrick Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * @@ -231,6 +231,7 @@ fdt_find_cons(const char *name) extern void com_fdt_init_cons(void); extern void imxuart_init_cons(void); +extern void mvuart_init_cons(void); extern void pluart_init_cons(void); extern void simplefb_init_cons(bus_space_tag_t); @@ -246,6 +247,7 @@ consinit(void) com_fdt_init_cons(); imxuart_init_cons(); + mvuart_init_cons(); pluart_init_cons(); simplefb_init_cons(&arm64_bs_tag); } diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index 794e3c16206..fc2a53bed31 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.99 2019/04/23 18:34:06 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.100 2019/04/30 20:04:31 patrick Exp $ # # GENERIC machine description file # @@ -149,6 +149,7 @@ mvgpio* at fdt? mvrng* at fdt? mvrtc* at fdt? mvtemp* at fdt? +mvuart* at fdt? # Rockchip SoCs rkclock* at fdt? early 1 diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK index 0d34ce00710..3ad5cd545ab 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.84 2019/04/23 18:34:06 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.85 2019/04/30 20:04:31 patrick Exp $ # # GENERIC machine description file # @@ -145,6 +145,7 @@ mvpinctrl* at fdt? early 1 mvgpio* at fdt? mvrng* at fdt? mvrtc* at fdt? +mvuart* at fdt? # Rockchip SoCs rkclock* at fdt? early 1 |