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

Parse "root=/dev/hdXN" args passed from the firmware and 

set default boot device accordingly.
Requested and okay'ed by cyber@.
This commit is contained in:
tsutsui 2007-08-13 02:09:01 +00:00
parent 320e4f3fc5
commit 6c44f1b32b
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/arch/cobalt/stand/boot/boot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.7 2007/08/10 16:47:07 tsutsui Exp $ */
/* $NetBSD: boot.c,v 1.8 2007/08/13 02:09:01 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -194,15 +194,40 @@ static int
get_bsdbootname(char **dev, char **kname, int *howtop)
{
int len, error;
int bootunit, bootpart;
char *bootstr_dev, *bootstr_kname;
char *prompt_dev, *prompt_kname;
char *ptr, *spec;
char c, namebuf[PATH_MAX];
static char bootdev[] = "wd0a";
bootstr_dev = prompt_dev = NULL;
bootstr_kname = prompt_kname = NULL;
/* first, get bootname from bootstrings */
/* first, get root device specified by the firmware */
spec = bootstring;
/* assume the last one is valid */
while ((spec = strstr(spec, "root=")) != NULL) {
spec += 5; /* skip 'root=' */
ptr = strchr(spec, ' ');
len = (ptr == NULL) ? strlen(spec) : ptr - spec;
/* decode unit and part from "/dev/hd[ab][1-4]" strings */
if (len == 9 && memcmp("/dev/hd", spec, 7) == 0) {
bootunit = spec[7] - 'a';
bootpart = spec[8] - '1';
if (bootunit >= 0 && bootunit < 2 &&
bootpart >= 0 && bootpart < 4) {
bootdev[sizeof(bootdev) - 3] = '0' + bootunit;
#if 0 /* bootpart is fdisk partition of Linux root */
bootdev[sizeof(bootdev) - 2] = 'a' + bootpart;
#endif
bootstr_dev = bootdev;
}
}
spec += len;
}
/* second, get bootname from bootstrings */
if ((spec = strstr(bootstring, "nbsd=")) != NULL) {
ptr = strchr(spec, ' ');
spec += 5; /* skip 'nbsd=' */

4
sys/arch/cobalt/stand/boot/version
View File

@ -1,4 +1,4 @@
$NetBSD: version,v 1.3 2007/08/10 16:47:07 tsutsui Exp $
$NetBSD: version,v 1.4 2007/08/13 02:09:01 tsutsui Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@ -7,3 +7,5 @@ is taken as the current.
0.1: Initial revision, only booting from the harddrive is supported
0.2: Flush all cache data in start.S
0.3: Parse boot_flags and pass boothowto value via bootinfo
0.4: parse "root=/dev/hdXN" args passed from the firmware and
set default boot device accordingly