oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no USE_BOOTPARAM

Browse Source
This commit is contained in:
Ben Gras 2012-05-05 11:48:21 +02:00
parent 3803c55856
commit ad0db93247
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/arch/i386/arch_system.c
View File

@ -163,7 +163,6 @@ __dead void arch_shutdown(int how)
reset(); reset();
} }
#if USE_BOOTPARAM
if (how == RBT_DEFAULT) { if (how == RBT_DEFAULT) {
how = RBT_RESET; how = RBT_RESET;
} }
@ -190,10 +189,6 @@ __dead void arch_shutdown(int how)
reset(); reset();
NOT_REACHABLE; NOT_REACHABLE;
} }
#else /* !USE_BOOTPARAM */
/* Poweroff without boot monitor */
arch_bios_poweroff();
#endif
NOT_REACHABLE; NOT_REACHABLE;
} }

4
kernel/start.c
View File

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

5
share/mk/bsd.own.mk
View File

@ -774,7 +774,7 @@ _MKVARS.yes= \
#MINIX-specific vars #MINIX-specific vars
_MKVARS.yes+= \ _MKVARS.yes+= \
MKWATCHDOG MKACPI MKAPIC MKMCONTEXT MKDEBUGREG MKSYSDEBUG \ MKWATCHDOG MKACPI MKAPIC MKMCONTEXT MKDEBUGREG MKSYSDEBUG \
MKLIVEUPDATE MKSTATECTL MKTRACE MKBOOTPARAM MKLIVEUPDATE MKSTATECTL MKTRACE
.for var in ${_MKVARS.yes} .for var in ${_MKVARS.yes}
${var}?= yes ${var}?= yes
.endfor .endfor
@ -844,7 +844,6 @@ MKSYSDEBUG:= no
MKLIVEUPDATE:= no MKLIVEUPDATE:= no
MKSTATECTL:= no MKSTATECTL:= no
MKTRACE:= no MKTRACE:= no
MKBOOTPARAM:= no
.endif .endif
# #
@ -907,7 +906,7 @@ ${var}?= no
# #
.for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP \ .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_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") .if (${${var:S/USE_/MK/}} == "no")
${var}:= no ${var}:= no
.else .else