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

Add MKBOOTPARAM option

Browse Source
This commit is contained in:
Arun Thomas 2011-09-16 17:31:07 +02:00
parent 92fa3189ab
commit 46581e701a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Makefile
View File

@ -85,6 +85,10 @@ CPPFLAGS+= -DUSE_STATECTL
CPPFLAGS+= -DUSE_TRACE CPPFLAGS+= -DUSE_TRACE
.endif .endif
.if ${USE_BOOTPARAM} != "no"
CPPFLAGS+= -DUSE_BOOTPARAM
.endif
# These come last, so the profiling buffer is at the end of the data segment # These come last, so the profiling buffer is at the end of the data segment
SRCS+= profile.c do_sprofile.c SRCS+= profile.c do_sprofile.c

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

@ -92,6 +92,7 @@ PUBLIC __dead void arch_shutdown(int how)
/* Mask all interrupts, including the clock. */ /* Mask all interrupts, including the clock. */
outb( INT_CTLMASK, ~0); outb( INT_CTLMASK, ~0);
#if USE_BOOTPARAM
if(minix_panicing) { if(minix_panicing) {
/* We're panicing? Then retrieve and decode currently /* We're panicing? Then retrieve and decode currently
* loaded segment selectors. * loaded segment selectors.
@ -198,6 +199,10 @@ PUBLIC __dead void arch_shutdown(int how)
panic("unexpected value for how: %d", how); panic("unexpected value for how: %d", how);
NOT_REACHABLE; NOT_REACHABLE;
} }
#else /* !USE_BOOTPARAM */
/* Poweroff without boot monitor */
arch_bios_poweroff();
#endif
NOT_REACHABLE; NOT_REACHABLE;
} }

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

@ -760,7 +760,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 MKLIVEUPDATE MKSTATECTL MKTRACE MKBOOTPARAM
.for var in ${_MKVARS.yes} .for var in ${_MKVARS.yes}
${var}?= yes ${var}?= yes
.endfor .endfor
@ -830,6 +830,7 @@ MKSYSDEBUG:= no
MKLIVEUPDATE:= no MKLIVEUPDATE:= no
MKSTATECTL:= no MKSTATECTL:= no
MKTRACE:= no MKTRACE:= no
MKBOOTPARAM:= no
.endif .endif
# #
@ -892,7 +893,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_LIVEUPDATE USE_STATECTL USE_TRACE USE_BOOTPARAM
.if (${${var:S/USE_/MK/}} == "no") .if (${${var:S/USE_/MK/}} == "no")
${var}:= no ${var}:= no
.else .else