i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/arm64: enable 8250 UART driver

Browse Source 
Change-Id: If8195e5e1032a172b3365f8771c4d87a2f0657ad
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5191
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
Reviewed-by: <[email protected]>
This commit is contained in:
David Karoly
2022-04-13 20:00:11 +00:00
committed by Fredrik Holmqvist
parent 21ac6f6b75
commit c4b8af3b6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm64/Jamfile
+1 -1
View File
@@ -26,7 +26,7 @@ KernelMergeObject kernel_arch_arm64.o :
# Serial UART and drivers # Serial UART and drivers
debug_uart.cpp debug_uart.cpp
# debug_uart_8250.cpp debug_uart_8250.cpp
# arch_uart_8250_omap.cpp # arch_uart_8250_omap.cpp
arch_uart_pl011.cpp arch_uart_pl011.cpp
arch_uart_linflex.cpp arch_uart_linflex.cpp
src/system/kernel/arch/arm64/arch_debug_console.cpp
+3 -3
View File
@@ -4,7 +4,7 @@
*/ */
#include <arch/debug_console.h> #include <arch/debug_console.h>
#include <arch/generic/debug_uart.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_8250_omap.h>
#include <arch/arm/arch_uart_pl011.h> #include <arch/arm/arch_uart_pl011.h>
#include <arch/arm64/arch_uart_linflex.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) { sizeof(args->arch_args.uart.kind)) == 0) {
sArchDebugUART = arch_get_uart_8250_omap(args->arch_args.uart.regs.start, sArchDebugUART = arch_get_uart_8250_omap(args->arch_args.uart.regs.start,
args->arch_args.uart.clock); 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) { sizeof(args->arch_args.uart.kind)) == 0) {
sArchDebugUART = arch_get_uart_8250(args->arch_args.uart.regs.start, sArchDebugUART = arch_get_uart_8250(args->arch_args.uart.regs.start,
args->arch_args.uart.clock); args->arch_args.uart.clock);
}*/ }
// Oh well. // Oh well.
if (sArchDebugUART == NULL) if (sArchDebugUART == NULL)