no USE_BOOTPARAM

diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index fd732d6df8dbab57c71897ab09a41346a48b5758..0f3e1cf140f1c51a149846e0eabb14608457b5a8 100644 (file)
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -163,7 +163,6 @@ __dead void arch_shutdown(int how)
                reset();
        }
 
-#if USE_BOOTPARAM
        if (how == RBT_DEFAULT) {
                how = RBT_RESET;
        }
@@ -190,10 +189,6 @@ __dead void arch_shutdown(int how)
                        reset();
                        NOT_REACHABLE;
        }
-#else /* !USE_BOOTPARAM */
-       /* Poweroff without boot monitor */
-       arch_bios_poweroff();
-#endif
 
        NOT_REACHABLE;
 }

diff --git a/kernel/start.c b/kernel/start.c
index 4e98b70e672d65bcebe9482916942d69039e53d0..32127b66a4fc7ca99f8f270db293e0e1c7c5dbce 100644 (file)
--- a/kernel/start.c
+++ b/kernel/start.c
@@ -41,7 +41,6 @@ void cstart(
   /* Copy the boot parameters to the local buffer. */
   arch_get_params(params_buffer, sizeof(params_buffer));
 
-#if USE_BOOTPARAM
   /* determine verbosity */
   if ((value = env_get(VERBOSEBOOTVARNAME)))
          verboseboot = atoi(value);
@@ -52,9 +51,6 @@ void cstart(
        system_hz = atoi(value);
   if(!value || system_hz < 2 || system_hz > 50000)     /* sanity check */
        system_hz = DEFAULT_HZ;
-#else /* !USE_BOOTPARAM */
-  system_hz = DEFAULT_HZ;
-#endif
 
 #ifdef DEBUG_SERIAL
   /* Intitialize serial debugging */

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4159822601de631ee050794198df1459ba9ee701..e60574e11b69a484508f8ab48c39a952bdb03c7c 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -774,7 +774,7 @@ _MKVARS.yes= \
 #MINIX-specific vars
 _MKVARS.yes+= \
        MKWATCHDOG MKACPI MKAPIC MKMCONTEXT MKDEBUGREG MKSYSDEBUG \
-       MKLIVEUPDATE MKSTATECTL MKTRACE MKBOOTPARAM
+       MKLIVEUPDATE MKSTATECTL MKTRACE 
 .for var in ${_MKVARS.yes}
 ${var}?=       yes
 .endfor
@@ -844,7 +844,6 @@ MKSYSDEBUG:=        no
 MKLIVEUPDATE:= no
 MKSTATECTL:=   no
 MKTRACE:=      no
-MKBOOTPARAM:=  no
 .endif
 
 #
@@ -907,7 +906,7 @@ ${var}?= no
 #
 .for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP \
 USE_WATCHDOG USE_ACPI USE_APIC USE_MCONTEXT USE_DEBUGREG USE_SYSDEBUG \
-USE_LIVEUPDATE USE_STATECTL USE_TRACE USE_BOOTPARAM
+USE_LIVEUPDATE USE_STATECTL USE_TRACE
 .if (${${var:S/USE_/MK/}} == "no")
 ${var}:= no
 .else