git: 0baacb12181a - stable/13 - arm64: fix build without FDT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Nov 2022 17:03:14 UTC
The branch stable/13 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=0baacb12181a02e49d10d208eae920b898ee74c0
commit 0baacb12181a02e49d10d208eae920b898ee74c0
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-09-29 19:33:33 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-11-02 17:02:25 +0000
arm64: fix build without FDT
static_kenv is only used under `FDT`, and `try_load_dtb` is only defined
with `FDT`.
Reviewed by: andrew, imp, manu
(cherry picked from commit 78f3c734a5b755ceb47fea220e94755c8e82bd67)
---
sys/arm64/arm64/machdep.c | 2 ++
sys/arm64/arm64/machdep_boot.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 6e2ec7d39ed2..21c9ced1b0cc 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -773,7 +773,9 @@ initarm(struct arm64_bootparams *abp)
update_special_regs(0);
link_elf_ireloc(kmdp);
+#ifdef FDT
try_load_dtb(kmdp);
+#endif
efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);
diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c
index 9ab4edf616e2..9b519f252369 100644
--- a/sys/arm64/arm64/machdep_boot.c
+++ b/sys/arm64/arm64/machdep_boot.c
@@ -53,9 +53,10 @@ __FBSDID("$FreeBSD$");
extern int *end;
static char *loader_envp;
-static char static_kenv[4096];
#ifdef FDT
+static char static_kenv[4096];
+
#define CMDLINE_GUARD "FreeBSD:"
#define LBABI_MAX_COMMAND_LINE 512
static char linux_command_line[LBABI_MAX_COMMAND_LINE + 1];