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 fdt_cpu_rootconf: fix root on wd(4)



details:   https://anonhg.NetBSD.org/src/rev/3298e9c481da
branches:  trunk
changeset: 993500:3298e9c481da
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Sep 14 22:08:49 2018 +0000

description:
fdt_cpu_rootconf: fix root on wd(4)

Remove duplicate 'ld' and replace with previously-missing 'wd'.

diffstat:

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

diffs (27 lines):

diff -r e0a782da99e6 -r 3298e9c481da sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Fri Sep 14 21:37:03 2018 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Fri Sep 14 22:08:49 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
                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);



Home | Main Index | Thread Index | Old Index