diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 6d66814a58aa..dfec47c3759d 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,23 +1,17 @@ -# $NetBSD: GENERIC,v 1.10 1998/07/28 23:43:33 thorpej Exp $ +# $NetBSD: GENERIC,v 1.11 1998/07/29 00:19:20 thorpej Exp $ # # POWERMAC config file # -machine macppc powerpc +include "arch/macppc/conf/std.macppc" maxusers 32 # Standard system options -options SWAPPAGER, VNODEPAGER, DEVPAGER -options EXEC_AOUT -options EXEC_ELF32 -options EXEC_SCRIPT #options UCONSOLE # users can use TIOCCONS (for xconsole) #options INSECURE # disable kernel security levels #options NTP # NTP phase/frequency locked loop -options HTABENTS=8192 - options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory diff --git a/sys/arch/macppc/conf/POWERMAC b/sys/arch/macppc/conf/POWERMAC index d82f2198b4a9..f4551da382a8 100644 --- a/sys/arch/macppc/conf/POWERMAC +++ b/sys/arch/macppc/conf/POWERMAC @@ -1,19 +1,13 @@ -# $NetBSD: POWERMAC,v 1.9 1998/07/28 23:43:33 thorpej Exp $ +# $NetBSD: POWERMAC,v 1.10 1998/07/29 00:19:20 thorpej Exp $ # # POWERMAC config file # -machine macppc powerpc +include "arch/macppc/conf/std.macppc" maxusers 32 # Standard system options -options SWAPPAGER, VNODEPAGER, DEVPAGER -options EXEC_AOUT -options EXEC_ELF32 -options EXEC_SCRIPT - -options HTABENTS=8192 options BUFPAGES=1200 options UVM diff --git a/sys/arch/macppc/conf/std.macppc b/sys/arch/macppc/conf/std.macppc new file mode 100644 index 000000000000..0e55ea65dd41 --- /dev/null +++ b/sys/arch/macppc/conf/std.macppc @@ -0,0 +1,26 @@ +# $NetBSD: std.macppc,v 1.1 1998/07/29 00:19:20 thorpej Exp $ +# +# Standard/required options for NetBSD/macppc. + +machine macppc powerpc + +# standard ("mandatory") kernel options. + +# Executable support: +options EXEC_ELF32 # (native) ELF32 binary support +options EXEC_AOUT # (native) a.out binary support (deprecated) +optoins EXEC_SCRIPT # shell script support + +# VM pager support +# XXX Not with UVM; garbage-collect these eventually. +options SWAPPAGER # paging; REQUIRED +options VNODEPAGER # mmap() of files; REQUIRED +options DEVPAGER # mmap() of devices; REQUIRED + +# UVM is the standard VM system on NetBSD/powerpc. +# XXX not yet, apparently. +#options UVM # New UVM VM system +#options PMAP_NEW # UVM's new pmap interface + +# Extra MMU HTAB entries (XXX why?) +options HTABENTS=8192