From b5d451373e1739f3138cbec9aa9d77123b36d72f Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Thu, 14 Oct 2021 19:32:02 +0000 Subject: [PATCH] Revert "arm64: Add missing fdt storage for FDT bus" This reverts commit 3e8376c6dd2c0de00620a182d02ba1559be5be6d. Reason for revert: Bootloader currently fails to load kernel It should be added back once the kernel can start. Change-Id: Iebefbf8681aff4dff09cef7b7eb832b61f7789c7 Reviewed-on: https://review.haiku-os.org/c/haiku/+/4579 Tested-by: Commit checker robot Reviewed-by: Alex von Gluck IV --- headers/private/kernel/arch/arm64/arch_kernel_args.h | 2 +- src/system/kernel/arch/arm64/arch_platform.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/headers/private/kernel/arch/arm64/arch_kernel_args.h b/headers/private/kernel/arch/arm64/arch_kernel_args.h index b65efa5039..81b080b0ab 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 fd10e94d63..95c1285264 100644 --- a/src/system/kernel/arch/arm64/arch_platform.cpp +++ b/src/system/kernel/arch/arm64/arch_platform.cpp @@ -7,13 +7,9 @@ #include -void* gFDT = NULL; - - status_t arch_platform_init(struct kernel_args *kernelArgs) { - gFDT = kernelArgs->arch_args.fdt; return B_OK; }