From 3e8376c6dd2c0de00620a182d02ba1559be5be6d Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 6 Sep 2021 16:41:21 -0500 Subject: [PATCH] arm64: Add missing fdt storage for FDT bus Change-Id: Ifadd47204be1ec688017a567d43dca38c80bd1df Reviewed-on: https://review.haiku-os.org/c/haiku/+/4431 Reviewed-by: Alex von Gluck IV Reviewed-by: Fredrik Holmqvist --- headers/private/kernel/arch/arm64/arch_kernel_args.h | 2 +- src/system/kernel/arch/arm64/arch_platform.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/headers/private/kernel/arch/arm64/arch_kernel_args.h b/headers/private/kernel/arch/arm64/arch_kernel_args.h index 81b080b0ab..b65efa5039 100644 --- a/headers/private/kernel/arch/arm64/arch_kernel_args.h +++ b/headers/private/kernel/arch/arm64/arch_kernel_args.h @@ -21,7 +21,7 @@ typedef struct { // needed for UEFI, otherwise kernel acpi support can't find ACPI root FixedWidthPointer acpi_root; // TODO: Deal with this later in the port -// FixedWidthPointer fdt; + FixedWidthPointer fdt; // uart_info uart; } _PACKED arch_kernel_args; diff --git a/src/system/kernel/arch/arm64/arch_platform.cpp b/src/system/kernel/arch/arm64/arch_platform.cpp index 95c1285264..fd10e94d63 100644 --- a/src/system/kernel/arch/arm64/arch_platform.cpp +++ b/src/system/kernel/arch/arm64/arch_platform.cpp @@ -7,9 +7,13 @@ #include +void* gFDT = NULL; + + status_t arch_platform_init(struct kernel_args *kernelArgs) { + gFDT = kernelArgs->arch_args.fdt; return B_OK; }