Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume that the root autoconfiguration device is named "mainbus".

This commit is contained in:
jmcneill 2017-05-28 00:30:49 +00:00
parent 439bf4cce8
commit 446d257186
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/evbarm/evbarm/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $ */
/* $NetBSD: autoconf.c,v 1.20 2017/05/28 00:30:49 jmcneill Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2017/05/28 00:30:49 jmcneill Exp $");
#include "opt_md.h"
@ -50,6 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $"
void (*evbarm_device_register)(device_t, void *);
void (*evbarm_device_register_post_config)(device_t, void *);
extern struct cfdata cfdata[];
#ifndef MEMORY_DISK_IS_ROOT
static int get_device(char *name, device_t *, int *);
static void set_root_device(void);
@ -164,13 +166,18 @@ void
cpu_configure(void)
{
struct mainbus_attach_args maa;
struct cfdata *cf;
(void) splhigh();
(void) splserial(); /* XXX need an splextreme() */
maa.ma_name = "mainbus";
config_rootfound("mainbus", &maa);
for (cf = &cfdata[0]; cf->cf_name; cf++) {
if (cf->cf_pspec == NULL) {
maa.ma_name = cf->cf_name;
if (config_rootfound(cf->cf_name, &maa) != NULL)
break;
}
}
/* Time to start taking interrupts so lets open the flood gates .... */
spl0();