From ec2b3d786b236ac64ff5d3e28e8d05e2293896d5 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Sun, 18 Jan 2026 17:19:03 -0800 Subject: [PATCH] loader: Only warn for !FDT && !ACPI take two For unclear reasons, we used to print two warnings about not having a DTB: First, printf("No valid device tree blob found!\n"); and immediately later a second, printf("WARNING! Trying to fire up the kernel, but no " "device tree blob found!\n"); A previous commit silenced the second warning in the event that the acpi.revision environment variable was set, on the theory that systems which have ACPI might not need a DTB; this commit silences the first of the two warnings under the same condition. Reviewed by: andrew Fixes: 3989a3d81701 ("loader: Only warn when we have neither FDT nor ACPI") Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D54772 --- stand/fdt/fdt_loader_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c index 161c2435c41..a53bb2e651f 100644 --- a/stand/fdt/fdt_loader_cmd.c +++ b/stand/fdt/fdt_loader_cmd.c @@ -993,7 +993,7 @@ fdt_copy(vm_offset_t va) debugf("fdt_copy va 0x%08jx\n", (uintmax_t)va); if (fdtp == NULL) { err = fdt_setup_fdtp(); - if (err) { + if (err && (getenv("acpi.revision") == NULL)) { printf("No valid device tree blob found!\n"); return (0); }