git: 6bcba8dac9a4 - main - arm64: Only check for freebsd, dts-version if we are booted in FDT mode.

[Emmanuel Vadot]

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=6bcba8dac9a4ddaeabf84ad8d31b1113a9dcf8c2

commit 6bcba8dac9a4ddaeabf84ad8d31b1113a9dcf8c2
Author:     Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-03-23 15:37:25 +0000
Commit:     Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-03-23 15:37:25 +0000

    arm64: Only check for freebsd,dts-version if we are booted in FDT mode.
    
    Reported by:      andrew
---
 sys/arm64/arm64/machdep.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index 308a870fe188..97fa374b1c75 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -1356,16 +1356,18 @@ initarm(struct arm64_bootparams *abp)
 		strlcpy(kernelname, env, sizeof(kernelname));
 
 #ifdef FDT
-	root = OF_finddevice("/");
-	if (OF_getprop(root, "freebsd,dts-version", dts_version, sizeof(dts_version)) > 0) {
-		if (strcmp(LINUX_DTS_VERSION, dts_version) != 0)
-			printf("WARNING: DTB version is %s while kernel expects %s, "
-			    "please update the DTB in the ESP\n",
-			    dts_version,
-			    LINUX_DTS_VERSION);
-	} else {
-		printf("WARNING: Cannot find freebsd,dts-version property, "
-		    "cannot check DTB compliance\n");
+	if (arm64_bus_method == ARM64_BUS_FDT) {
+		root = OF_finddevice("/");
+		if (OF_getprop(root, "freebsd,dts-version", dts_version, sizeof(dts_version)) > 0) {
+			if (strcmp(LINUX_DTS_VERSION, dts_version) != 0)
+				printf("WARNING: DTB version is %s while kernel expects %s, "
+				    "please update the DTB in the ESP\n",
+				    dts_version,
+				    LINUX_DTS_VERSION);
+		} else {
+			printf("WARNING: Cannot find freebsd,dts-version property, "
+			    "cannot check DTB compliance\n");
+		}
 	}
 #endif