Enable cduart(4) on arm64.

OK kettenis@

diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index 4b20d65..693c135 100644 (file)
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.67 2022/01/01 18:52:36 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.68 2022/02/25 13:51:02 visa Exp $ */
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
@@ -177,6 +177,7 @@ fdt_find_cons(const char *name)
 }
 
 void   amluart_init_cons(void);
+void   cduart_init_cons(void);
 void   com_fdt_init_cons(void);
 void   exuart_init_cons(void);
 void   imxuart_init_cons(void);
@@ -195,6 +196,7 @@ consinit(void)
        consinit_called = 1;
 
        amluart_init_cons();
+       cduart_init_cons();
        com_fdt_init_cons();
        exuart_init_cons();
        imxuart_init_cons();

diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index ebe9743..7eed58a 100644 (file)
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.225 2022/02/20 19:25:57 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.226 2022/02/25 13:51:02 visa Exp $
 #
 # GENERIC machine description file
 #
@@ -306,6 +306,9 @@ sxitwi*             at fdt? early 1 # I2C controller
 iic*           at sxitwi?      # I2C bus
 dwxe*          at fdt?
 
+# Xilinx Zynq UltraScale+ SoCs
+cduart*                at fdt?
+
 # PCI
 ppb*           at pci?                 # PCI-PCI bridges
 pci*           at ppb?

diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index cc49dad..65d254e 100644 (file)
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.167 2022/01/08 15:30:46 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.168 2022/02/25 13:51:02 visa Exp $
 
 machine                arm64
 maxusers       4
@@ -239,6 +239,9 @@ sxitwi*             at fdt?         # I2C controller
 iic*           at sxitwi?      # I2C bus
 dwxe*          at fdt?
 
+# Xilinx Zynq UltraScale+ SoCs
+cduart*                at fdt?
+
 # PCI
 ppb*           at pci?                 # PCI-PCI bridges
 pci*           at ppb?