Module Name: src
Committed By: jmcneill
Date: Sat Nov 6 19:44:22 UTC 2021
Modified Files:
src/sys/stand/efiboot: efifdt.c
Log Message:
Revert part of previous commit that broke DT booting.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/stand/efiboot/efifdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.32 src/sys/stand/efiboot/efifdt.c:1.33
--- src/sys/stand/efiboot/efifdt.c:1.32 Wed Nov 3 22:02:36 2021
+++ src/sys/stand/efiboot/efifdt.c Sat Nov 6 19:44:22 2021
@@ -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, con
}
} 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;
}
