diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-12 04:13:03 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-02-12 04:13:03 +0000 |
| commit | f3d27d891b8f6aea52d8ddd213eb82517692622a (patch) | |
| tree | c05a63633c42425d33576646a631e19012f7669a | |
| parent | 68fe06df6d6fa032c5b07fa0d4aac1b6f28b060c (diff) | |
Do not overwrite boothowto if not in the ramdisk kernel, allows single
user to work. While here nuke some if0'ed code we we will never use.
| -rw-r--r-- | sys/arch/arm/arm/arm32_machdep.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c index ba63624248f..fd3b37a3259 100644 --- a/sys/arch/arm/arm/arm32_machdep.c +++ b/sys/arch/arm/arm/arm32_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm32_machdep.c,v 1.2 2004/02/01 06:10:33 drahn Exp $ */ +/* $OpenBSD: arm32_machdep.c,v 1.3 2004/02/12 04:13:02 drahn Exp $ */ /* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */ /* @@ -264,8 +264,6 @@ cpu_startup() */ #ifdef RAMDISK_HOOKS boothowto = RB_SINGLE | RB_DFLTROOT; -#else - boothowto = RB_AUTOBOOT; #endif /* RAMDISK_HOOKS */ /* @@ -534,26 +532,6 @@ parse_mi_bootargs(args) /* if (get_bootconf_option(args, "nbuf", BOOTOPT_TYPE_INT, &integer)) bufpages = integer;*/ -#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MEMORY_DISK_ROOT_SIZE) - if (get_bootconf_option(args, "memorydisc", BOOTOPT_TYPE_INT, &integer) - || get_bootconf_option(args, "memorydisk", BOOTOPT_TYPE_INT, &integer)) { - md_root_size = integer; - md_root_size *= 1024; - if (md_root_size < 32*1024) - md_root_size = 32*1024; - if (md_root_size > 2048*1024) - md_root_size = 2048*1024; - } -#endif /* NMD && MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */ - - if (get_bootconf_option(args, "quiet", BOOTOPT_TYPE_BOOLEAN, &integer) - || get_bootconf_option(args, "-q", BOOTOPT_TYPE_BOOLEAN, &integer)) - if (integer) - boothowto |= AB_QUIET; - if (get_bootconf_option(args, "verbose", BOOTOPT_TYPE_BOOLEAN, &integer) - || get_bootconf_option(args, "-v", BOOTOPT_TYPE_BOOLEAN, &integer)) - if (integer) - boothowto |= AB_VERBOSE; } #endif |