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

Handle using "octeth" as root device by converting "octethN" to "cnmacN"

Browse Source 
for any N < 100.  This allows booting for u-boot to use root=$(ethact)
on the command line and the kernel can use the ethernet interface the
kernel was loaded on as the NFS root device.
This commit is contained in:
simonb 2020-08-17 06:23:01 +00:00
parent de5f9e0f37
commit 02abda66c9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/evbmips/cavium/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.8 2020/06/23 05:19:12 simonb Exp $ */ /* $NetBSD: autoconf.c,v 1.9 2020/08/17 06:23:01 simonb Exp $ */
/* /*
* Copyright 2002 Wasabi Systems, Inc. * Copyright 2002 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2020/06/23 05:19:12 simonb Exp $"); __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2020/08/17 06:23:01 simonb Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -95,12 +95,24 @@ findroot(void)
return; return;
if (rootspec && *rootspec) { if (rootspec && *rootspec) {
/* if we get passed root=octethN, convert to cnmacN */
if (strncmp(rootspec, "octeth", 6) == 0) {
/* allow for up to 100 interfaces */
static char buf[sizeof("cnmacXX")];
const char *cp = &rootspec[strlen("octeth")];
KASSERT(strlen(cp) < sizeof("XX"));
snprintf(buf, sizeof(buf), "cnmac%s", cp);
rootspec = buf;
}
/* XXX hard coded "cnmac" for network boot */ /* XXX hard coded "cnmac" for network boot */
if (strncmp(rootspec, "cnmac", 5) == 0) { if (strncmp(rootspec, "cnmac", 5) == 0) {
rootfstype = "nfs"; rootfstype = "nfs";
netboot = 1; netboot = 1;
return; return;
} }
/* /*
* XXX * XXX
* Assume that if the root spec is not a cnmac, it'll * Assume that if the root spec is not a cnmac, it'll