[src/netbsd-9]: src/sys/stand/efiboot Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/857cc16a7842
branches:  netbsd-9
changeset: 962905:857cc16a7842
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 01 13:25:22 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #142):

        sys/stand/efiboot/efifdt.c: revision 1.19

Only set #address-cells and #size-cells properties on /chosen if we are
fabricating a devicetree (ACPI mode). Fixes PR# 54494

diffstat:

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

diffs (37 lines):

diff -r a1355b6e29cd -r 857cc16a7842 sys/stand/efiboot/efifdt.c
--- a/sys/stand/efiboot/efifdt.c        Sun Sep 01 13:21:39 2019 +0000
+++ b/sys/stand/efiboot/efifdt.c        Sun Sep 01 13:25:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.17.2.1 2019/08/04 11:37:56 martin Exp $ */
+/* $NetBSD: efifdt.c,v 1.17.2.2 2019/09/01 13:25:22 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jason R. Thorpe
@@ -292,8 +292,15 @@
                        continue;
                }
 
+               fdt_setprop_u32(fdt_data,
+                   fdt_path_offset(fdt_data, FDT_CHOSEN_NODE_PATH), "#address-cells", 2);
+               fdt_setprop_u32(fdt_data,
+                   fdt_path_offset(fdt_data, FDT_CHOSEN_NODE_PATH), "#size-cells", 2);
+               fdt_setprop_empty(fdt_data,
+                   fdt_path_offset(fdt_data, FDT_CHOSEN_NODE_PATH), "ranges");
+
                snprintf(buf, sizeof(buf), "framebuffer@%" PRIx64, mode->FrameBufferBase);
-               fb = fdt_add_subnode(fdt_data, fdt_path_offset(fdt_data, "/chosen"), buf);
+               fb = fdt_add_subnode(fdt_data, fdt_path_offset(fdt_data, FDT_CHOSEN_NODE_PATH), buf);
                if (fb < 0)
                        panic("FDT: Failed to create framebuffer node");
 
@@ -327,10 +334,6 @@
        if (chosen < 0)
                panic("FDT: Failed to create " FDT_CHOSEN_NODE_PATH " node");
 
-       fdt_setprop_u32(fdt_data, chosen, "#address-cells", 2);
-       fdt_setprop_u32(fdt_data, chosen, "#size-cells", 2);
-       fdt_setprop_empty(fdt_data, chosen, "ranges");
-
        if (*bootargs)
                fdt_setprop_string(fdt_data, chosen, "bootargs", bootargs);