Module Name: src
Committed By: jakllsch
Date: Fri Sep 14 22:08:49 UTC 2018
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
fdt_cpu_rootconf: fix root on wd(4)
Remove duplicate 'ld' and replace with previously-missing 'wd'.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 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.35 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.36
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.35 Fri Sep 7 17:21:58 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Fri Sep 14 22:08:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.35 2018/09/07 17:21:58 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.35 2018/09/07 17:21:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.36 2018/09/14 22:08:49 jakllsch Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -634,7 +634,7 @@ fdt_cpu_rootconf(void)
if (get_bootconf_option(boot_args, "root", BOOTOPT_TYPE_STRING, &ptr) != 0)
break;
- if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "ld"))
+ if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "wd"))
fdt_detect_root_device(dev);
}
deviter_release(&di);
