git: 483b42cee78d - stable/13 - arm64: coresight: fix the build without FDT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Nov 2022 17:03:12 UTC
The branch stable/13 has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=483b42cee78dc7fc21e9f5e481f7b46c39173475
commit 483b42cee78dc7fc21e9f5e481f7b46c39173475
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: coresight: fix the build without FDT
coresight_cpu_debug only has an FDT attachment, so let's not build it
for kernels without FDT.
coresight.h includes sys/malloc.h via header pollution
dev/ofw/openfirm.h; include it directly in case we're building without
FDT.
Reviewed by: andrew, manu
(cherry picked from commit b4c2a5b689864430583eee96e449519db15911b9)
---
sys/arm64/coresight/coresight.h | 1 +
sys/conf/files.arm64 | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/arm64/coresight/coresight.h b/sys/arm64/coresight/coresight.h
index a3aa71cb207f..adbf17ce08df 100644
--- a/sys/arm64/coresight/coresight.h
+++ b/sys/arm64/coresight/coresight.h
@@ -37,6 +37,7 @@
#include "opt_platform.h"
#include <sys/bus.h>
+#include <sys/malloc.h>
#ifdef FDT
#include <dev/ofw/openfirm.h>
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 05ee9b183df7..8c60edc29448 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -84,7 +84,7 @@ arm64/coresight/coresight_acpi.c optional acpi
arm64/coresight/coresight_fdt.c optional fdt
arm64/coresight/coresight_if.m standard
arm64/coresight/coresight_cmd.c standard
-arm64/coresight/coresight_cpu_debug.c standard
+arm64/coresight/coresight_cpu_debug.c optional fdt
arm64/coresight/coresight_etm4x.c standard
arm64/coresight/coresight_etm4x_acpi.c optional acpi
arm64/coresight/coresight_etm4x_fdt.c optional fdt