Module Name: src
Committed By: mrg
Date: Wed Mar 9 10:06:36 UTC 2022
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/evbarm/fdt/fdt_machdep.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/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.87 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.88
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.87 Fri Mar 19 10:23:34 2021
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Wed Mar 9 10:06:36 2022
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ fdt_cpu_rootconf(void)
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;
