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 in fdt_cpu_rootconf(), return without do...



details:   https://anonhg.NetBSD.org/src/rev/104871f0a877
branches:  trunk
changeset: 363393:104871f0a877
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 09 10:06:36 2022 +0000

description:
in fdt_cpu_rootconf(), return without doing anything (like setting
"root=something" in boot_args, or booted_device), if booted_device
is already set to something.

this makes raidframe softroot work on evbarm.

diffstat:

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

diffs (28 lines):

diff -r 64b903f9aab5 -r 104871f0a877 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Wed Mar 09 10:04:06 2022 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Wed Mar 09 10:06:36 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.87 2021/03/19 10:23:34 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.88 2022/03/09 10:06:36 mrg 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.87 2021/03/19 10:23:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.88 2022/03/09 10:06:36 mrg Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
@@ -879,6 +879,9 @@
        deviter_t di;
        char *ptr;
 
+       if (booted_device != NULL)
+               return;
+
        for (dev = deviter_first(&di, 0); dev; dev = deviter_next(&di)) {
                if (device_class(dev) != DV_DISK)
                        continue;



Home | Main Index | Thread Index | Old Index