From c4b8af3b6fa8fe8ef4abc2ed4fd415f2801bae37 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Sat, 9 Apr 2022 19:25:20 +0200
Subject: [PATCH] kernel/arm64: enable 8250 UART driver

Change-Id: If8195e5e1032a172b3365f8771c4d87a2f0657ad
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5191
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
Reviewed-by: <oliver.ruiz.dorantes@gmail.com>
---
 src/system/kernel/arch/arm64/Jamfile                | 2 +-
 src/system/kernel/arch/arm64/arch_debug_console.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/system/kernel/arch/arm64/Jamfile b/src/system/kernel/arch/arm64/Jamfile
index 30f1845cf0..e9d97b6832 100644
--- a/src/system/kernel/arch/arm64/Jamfile
+++ b/src/system/kernel/arch/arm64/Jamfile
@@ -26,7 +26,7 @@ KernelMergeObject kernel_arch_arm64.o :
 
     # Serial UART and drivers
 	debug_uart.cpp
-#	debug_uart_8250.cpp
+	debug_uart_8250.cpp
 #	arch_uart_8250_omap.cpp
 	arch_uart_pl011.cpp
 	arch_uart_linflex.cpp
diff --git a/src/system/kernel/arch/arm64/arch_debug_console.cpp b/src/system/kernel/arch/arm64/arch_debug_console.cpp
index 07b72c76d5..aab3e8445e 100644
--- a/src/system/kernel/arch/arm64/arch_debug_console.cpp
+++ b/src/system/kernel/arch/arm64/arch_debug_console.cpp
@@ -4,7 +4,7 @@
  */
 #include <arch/debug_console.h>
 #include <arch/generic/debug_uart.h>
-// #include <arch/generic/debug_uart_8250.h>
+#include <arch/generic/debug_uart_8250.h>
 // #include <arch/arm/arch_uart_8250_omap.h>
 #include <arch/arm/arch_uart_pl011.h>
 #include <arch/arm64/arch_uart_linflex.h>
@@ -110,11 +110,11 @@ arch_debug_console_init(kernel_args *args)
 		sizeof(args->arch_args.uart.kind)) == 0) {
 		sArchDebugUART = arch_get_uart_8250_omap(args->arch_args.uart.regs.start,
 			args->arch_args.uart.clock);
-	} else if (strncmp(args->arch_args.uart.kind, UART_KIND_8250,
+	}*/ else if (strncmp(args->arch_args.uart.kind, UART_KIND_8250,
 		sizeof(args->arch_args.uart.kind)) == 0) {
 		sArchDebugUART = arch_get_uart_8250(args->arch_args.uart.regs.start,
 			args->arch_args.uart.clock);
-	}*/
+	}
 
 	// Oh well.
 	if (sArchDebugUART == NULL)