summaryrefslogtreecommitdiff
path: root/sys/stand
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2021-11-06 19:44:22 +0000
committerjmcneill <jmcneill@NetBSD.org>2021-11-06 19:44:22 +0000
commit0999b5cf96088d34b400675741678ea9b470fc7a (patch)
tree6fbe72186d520c34a59b1872ac650684e0a548bb /sys/stand
parentde03e2f692c6be03e5843e9095cbf4b576d37ce3 (diff)
Revert part of previous commit that broke DT booting.
Diffstat (limited to 'sys/stand')
-rw-r--r--sys/stand/efiboot/efifdt.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/stand/efiboot/efifdt.c b/sys/stand/efiboot/efifdt.c
index 84d7f39781d..cdee6b022e9 100644
--- a/sys/stand/efiboot/efifdt.c
+++ b/sys/stand/efiboot/efifdt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.32 2021/11/03 22:02:36 skrll Exp $ */
+/* $NetBSD: efifdt.c,v 1.33 2021/11/06 19:44:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -594,11 +594,7 @@ arch_prepare_boot(const char *fname, const char *args, u_long *marks)
}
} else
#endif
- if (!dtb_addr || efi_fdt_set_data((void *)(uintptr_t)dtb_addr) != 0) {
- if (!dtb_addr)
- printf("boot: no DTB provided\n");
- else
- printf("boot: invalid DTB data\n");
+ if (dtb_addr && efi_fdt_set_data((void *)(uintptr_t)dtb_addr) != 0) {
return EINVAL;
}