Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbarm/fdt Initialize boot_args before bootstrap fo...



details:   https://anonhg.NetBSD.org/src/rev/6a1e0a33cef5
branches:  trunk
changeset: 824480:6a1e0a33cef5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jun 06 09:56:00 2017 +0000

description:
Initialize boot_args before bootstrap for the benefit of platform code.

diffstat:

 sys/arch/evbarm/fdt/fdt_machdep.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r a2b15ecd3b03 -r 6a1e0a33cef5 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Tue Jun 06 08:21:53 2017 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Tue Jun 06 09:56:00 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.5 2017/06/06 00:28:05 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.6 2017/06/06 09:56:00 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.5 2017/06/06 00:28:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.6 2017/06/06 09:56:00 jmcneill Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -168,6 +168,11 @@
        DPRINTN((uintptr_t)fdt_addr_r, 16);
        DPRINT(">");
 
+       const int chosen = OF_finddevice("/chosen");
+       if (chosen >= 0)
+               OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
+       boot_args = bootargs;
+
        DPRINT(" devmap");
        pmap_devmap_register(plat->devmap());
 
@@ -179,11 +184,6 @@
        if (set_cpufuncs())
                panic("cpu not recognized!");
 
-       const int chosen = OF_finddevice("/chosen");
-       if (chosen >= 0)
-               OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
-       boot_args = bootargs;
-
        /*
         * If stdout-path is specified on the command line, override the
         * value in /chosen/stdout-path before initializing console.



Home | Main Index | Thread Index | Old Index