Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/stand/efiboot Revert part of previous commit that broke ...



details:   https://anonhg.NetBSD.org/src/rev/c058b9eb736b
branches:  trunk
changeset: 1024814:c058b9eb736b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Nov 06 19:44:22 2021 +0000

description:
Revert part of previous commit that broke DT booting.

diffstat:

 sys/stand/efiboot/efifdt.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r c37e73ff636e -r c058b9eb736b sys/stand/efiboot/efifdt.c
--- a/sys/stand/efiboot/efifdt.c        Sat Nov 06 19:36:12 2021 +0000
+++ b/sys/stand/efiboot/efifdt.c        Sat Nov 06 19:44:22 2021 +0000
@@ -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 @@
                }
        } 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;
        }
 



Home | Main Index | Thread Index | Old Index