From 6b0841e32b3b63979aef619abb26b999cb46a85f Mon Sep 17 00:00:00 2001 From: toddpw Date: Thu, 7 Dec 2000 10:57:17 +0000 Subject: [PATCH] Fix PR port-mac68k/11343 --- etc/etc.mac68k/Makefile.inc | 23 ++- sys/arch/mac68k/conf/GENERICSBC | 264 ++++++++++++++++++++++++++++++++ sys/arch/mac68k/conf/INSTALLSBC | 185 ++++++++++++++++++++++ 3 files changed, 467 insertions(+), 5 deletions(-) create mode 100644 sys/arch/mac68k/conf/GENERICSBC create mode 100644 sys/arch/mac68k/conf/INSTALLSBC diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc index 4763e0543076..a8e2966d92dd 100644 --- a/etc/etc.mac68k/Makefile.inc +++ b/etc/etc.mac68k/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.6 2000/06/11 13:01:29 fredb Exp $ +# $NetBSD: Makefile.inc,v 1.7 2000/12/07 10:57:18 toddpw Exp $ # # mac68k-specific release building goo # @@ -8,8 +8,8 @@ # simply its corresponding config with "ncrscsi" commented out, # and "sbc" uncommented. # -BUILD_KERNELS?= INSTALL # INSTALLSBC -EXTRA_KERNELS?= # GENERICSBC +BUILD_KERNELS?= INSTALL INSTALLSBC +EXTRA_KERNELS?= GENERICSBC INSTALLATION_DIRS+= installation/instkernel @@ -22,8 +22,21 @@ snap_md_post: cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && ${MAKE} ${MAKEFLAGS} clean .endif .for k in ${BUILD_KERNELS} +.ifndef UPDATE cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && \ - ${MAKE} ${MAKEFLAGS} INSTALL_KERNEL=${k} && ${MAKE} ${MAKEFLAGS} release INSTALL_KERNEL=${k} + ${MAKE} clean +.endif + cd ${.CURDIR}/../distrib/mac68k/instkernel/instkernel && \ + ${MAKE} ${MAKEFLAGS} INSTALL_KERNEL=${k} && \ + ${MAKE} ${MAKEFLAGS} INSTALL_KERNEL=${k} release .endfor - cd ${.CURDIR}/../distrib/notes && ${MAKE} ${MAKEFLAGS} && ${MAKE} ${MAKEFLAGS} release + cd ${KERNOBJDIR}/GENERICSBC && \ + tar cf - netbsd |\ + gzip -c -9 > ${RELEASEDIR}/binary/sets/kern_sbc.tgz +.ifndef UPDATE + cd ${.CURDIR}/../distrib/notes && ${MAKE} clean +.endif + cd ${.CURDIR}/../distrib/notes && \ + ${MAKE} ${MAKEFLAGS} && \ + ${MAKE} ${MAKEFLAGS} release sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/instkernel diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC new file mode 100644 index 000000000000..d65468fc4355 --- /dev/null +++ b/sys/arch/mac68k/conf/GENERICSBC @@ -0,0 +1,264 @@ +# $NetBSD: GENERICSBC,v 1.1 2000/12/07 10:57:17 toddpw Exp $ +# +# GENERIC + +include "arch/mac68k/conf/std.mac68k" + +#ident "GENERIC-$Revision: 1.1 $" + +maxusers 16 # estimated number of users + +# CPU support. At least one is REQUIRED. +options M68040 +options M68030 +options M68020 # Note: must have 68851 PMMU + +# CPU-related options. +options FPSP +options FPU_EMULATE + +# Standard system options + +options UCONSOLE # users can use TIOCCONS (for xconsole) +options INSECURE # disable kernel security levels + +options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT +#options NTP # NTP phase/frequency locked loop + +options KTRACE # system call tracing via ktrace(1) + +options SYSVMSG # System V-like message queues +options SYSVSEM # System V-like semaphores +options SYSVSHM # System V-like memory sharing +#options SHMMAXPGS=1024 # 1024 pages is the default + +options LKM # loadable kernel modules + +# Diagnostic/debugging support options +options DIAGNOSTIC # cheap kernel consistency checks +#options DEBUG # expensive debugging checks/support +options KMEMSTATS # kernel memory statistics (vmstat -m) +options DDB # in-kernel debugger +#options DDB_HISTORY_SIZE=100 # enable history editing in DDB +#options KGDB # remote debugger +#options KGDBDEV=0xc01 # kgdb device number (dev_t) +#options KGDBRATE=38400 # baud rate +#makeoptions DEBUG="-g" # compile full symbol table + +# Compatibility options +#options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8, +#options COMPAT_09 # NetBSD 0.9, +options COMPAT_10 # NetBSD 1.0, +options COMPAT_11 # NetBSD 1.1, +options COMPAT_12 # NetBSD 1.2, +options COMPAT_13 # NetBSD 1.3, +options COMPAT_14 # NetBSD 1.4, +options COMPAT_43 # and 4.3BSD + +options COMPAT_SUNOS # compatibility with SunOS 4.x binaries +#options COMPAT_SVR4 # compatibility with SVR4 binaries +#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries +#options COMPAT_LINUX # compatibility with Linux/m68k binaries +#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) + +# File systems +file-system FFS # UFS +file-system EXT2FS # second extended file system (linux) +file-system LFS # log-structured file system +file-system MFS # memory file system +file-system NFS # Network File System client +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +file-system NULLFS # loopback file system +file-system OVERLAY # overlay file system +file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system +file-system CODA # Venus/Coda distributed file system + +# File system options +options QUOTA # UFS quotas +#options FFS_EI # FFS Endian Independant support +options SOFTDEP # FFS soft updates support. +options NFSSERVER # Network File System server +#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and + # immutable) behave as system flags. + +# Networking options +options GATEWAY # packet forwarding +options INET # IP + ICMP + TCP + UDP +options INET6 # IPV6 +#options IPSEC # IP security +#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) +#options IPSEC_DEBUG # debug for IP security +#options MROUTING # IP multicast routing +options NS # XNS +#options NSIP # XNS tunneling over IP +options ISO,TPIP # OSI +#options EON # OSI tunneling over IP +options CCITT,LLC,HDLC # X.25 +options NETATALK # AppleTalk networking protocols +options PPP_BSDCOMP # BSD-Compress compression support for PPP +options PPP_DEFLATE # Deflate compression support for PPP +options PPP_FILTER # Active filter support for PPP (requires bpf) +options PFIL_HOOKS # pfil(9) packet filter hooks + +# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended. +#options TCP_COMPAT_42 + +# These options enable verbose messages for several subsystems. +# Warning, these may compile large string tables into the kernel! +options SCSIVERBOSE # human readable SCSI error messages + +# wscons options +#options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +options WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10) + +# rcons options; note that 1-bit and 8-bit displays are supported by default. +options RCONS_2BPP # Support for 2-bit display +options RCONS_4BPP # Support for 4-bit display +options RCONS_16BPP # Support for 16-bit display + +# Mac-specific options +#options ALTXBUTTONS # Map Opt-{1,2,3} to mouse buttons +#options DISABLE_EXT_CACHE # If really paranoid, disable IIci ext. cache +options GRF_COMPAT # Include grf compatibility code +#options MRG_ADB # Use ROM-based ADB driver +options ZS_CONSOLE_ABORT + +options NFS_BOOT_DHCP + +# Kernel root file system and dump configuration. +config netbsd root on ? type ? + +# +# Device configuration +# + +mainbus0 at root + +fpu0 at mainbus? # Floating-Point Coprocessor support + + +# Basic Bus Support + +# On-board I/O bus support +obio0 at mainbus? + +# NuBus support +nubus0 at mainbus? + + +# Console Devices + +# Apple Desktop Bus interface +adb0 at obio? +aed* at adb? # ADB event device +akbd* at adb? # ADB keyboard +ams* at adb? # ADB mouse + +# Basic frame buffer support +intvid0 at obio? # Internal video hardware +macvid* at nubus? # NuBus video card + +# Device-independent frame buffer interface +macfb* at intvid? +macfb* at macvid? + +# Workstation Console devices +wsdisplay* at macfb? console ? +wskbd* at akbd? console ? +wsmouse* at ams? + + +# Serial Devices + +# On-board serial interface +zsc0 at obio? +zstty* at zsc? channel ? + + +# SCSI Controllers and Devices + +# SCSI controllers +# XXX - use only one of ncrscsi or sbc +#ncrscsi0 at obio? # SCSI NCR 5380 +sbc0 at obio? flags 0x1 # MI SCSI NCR 5380 +esp0 at obio? # SCSI NCR 53C9x +esp1 at obio? # SCSI NCR 53C9x + +# SCSI bus support +scsibus* at scsi? + +# SCSI devices +sd* at scsibus? target ? lun ? # SCSI disk drives +st* at scsibus? target ? lun ? # SCSI tape drives +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +ch* at scsibus? target ? lun ? # SCSI autochangers +se* at scsibus? target ? lun ? # SCSI ethernet +ss* at scsibus? target ? lun ? # SCSI scanners +uk* at scsibus? target ? lun ? # SCSI unknown + + +# Miscellaneous mass storage devices + +# IWM floppy disk controller +iwm0 at obio? # Sony driver (800K GCR) +fd* at iwm? drive ? + + +# Network Interfaces + +# On-board Ethernet controllers +sn* at obio? # SONIC-based (DP83932, DP83916) +mc* at obio? # MACE-based + +# NuBus Ethernet controllers +ae* at nubus? # DP8390-based +sn* at nubus? # SONIC-based (DP83932, DP83916) +sm* at nubus? # SMC 91cxx-based + +nsphy* at mii? phy ? +ukphy* at mii? phy ? + +# Audio Devices + +# On-board audio hardware +asc0 at obio? # ASC/EASC audio + +# Pseudo-Devices + +# disk/mass storage pseudo-devices +pseudo-device ccd 4 # concatenated/striped disk devices +#pseudo-device raid 4 # RAIDframe disk driver +#options RAID_AUTOCONFIG # auto-configuration of RAID components +pseudo-device md 1 # memory disk device (ramdisk) +pseudo-device vcoda 1 # Venus/Coda distributed file system +pseudo-device vnd 4 # disk-like interface to files + +# network pseudo-devices +pseudo-device bpfilter 12 # Berkeley packet filter +pseudo-device ipfilter # IP filter (firewall) and NAT +pseudo-device loop # network loopback +pseudo-device ppp 2 # Point-to-Point Protocol +pseudo-device sl 2 # Serial Line IP +#pseudo-device strip 2 # Starmode Radio IP (Metricom) +pseudo-device tun 2 # network tunneling over tty +#pseudo-device gre 2 # generic L3 over IP tunnel +pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) +#pseudo-device faith 1 # IPv[46] tcp relay translation i/f +#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation + +# miscellaneous pseudo-devices +pseudo-device grf 2 # grf emulation for wscons +pseudo-device ite 1 # ite emulation for wscons +pseudo-device pty # pseudo-terminals +#pseudo-device tb 1 # tablet line discipline + +# random number generator pseudo-device +pseudo-device rnd # /dev/random and in-kernel generator +#options RND_COM # use "com" randomness as well (BROKEN) diff --git a/sys/arch/mac68k/conf/INSTALLSBC b/sys/arch/mac68k/conf/INSTALLSBC new file mode 100644 index 000000000000..256269ec8dd5 --- /dev/null +++ b/sys/arch/mac68k/conf/INSTALLSBC @@ -0,0 +1,185 @@ +# $NetBSD: INSTALLSBC,v 1.1 2000/12/07 10:57:17 toddpw Exp $ +# +# INSTALL + +include "arch/mac68k/conf/std.mac68k" + +makeoptions COPTS="-Os" # Optimise for space. Implies -O2 + +maxusers 8 # estimated number of users + +# Enable the hooks used for initializing the ram-disk. +options MEMORY_DISK_HOOKS +options MEMORY_DISK_IS_ROOT # Force root on ram-disk +options MINIROOTSIZE=5120 # 2.5 MB + +# CPU support. At least one is REQUIRED. +options M68040 +options M68030 +options M68020 # Note: must have 68851 PMMU + +# CPU-related options. +options FPSP +options FPU_EMULATE + +# Standard system options + +options UCONSOLE # users can use TIOCCONS (for xconsole) +options INSECURE # disable kernel security levels + +options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT + +# Diagnostic/debugging support options - XXX remove these at some point +options DIAGNOSTIC # cheap kernel consistency checks +options DDB # in-kernel debugger +#options ADB_DEBUG # ADB debugging + +# Compatibility options +options COMPAT_10 # NetBSD 1.0, +options COMPAT_11 # NetBSD 1.1, +options COMPAT_12 # NetBSD 1.2, +options COMPAT_13 # NetBSD 1.3, +options COMPAT_14 # NetBSD 1.4, +options COMPAT_43 # and 4.3BSD + +# File systems +file-system FFS # UFS +file-system NFS # Network File System client +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system KERNFS # /kern + +# Filesystem options +#options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space +#options VNODE_OP_NOINLINE # Save space by not inlining vnode op calls + +# Networking options +options INET # IP + ICMP + TCP + UDP + +# These options enable verbose messages for several subsystems. +# Warning, these may compile large string tables into the kernel! +options SCSIVERBOSE # human readable SCSI error messages + +# wscons options +#options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +options WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10) + +# rcons options; note that 1-bit and 8-bit displays are supported by default. +options RCONS_2BPP # Support for 2-bit display +options RCONS_4BPP # Support for 4-bit display +options RCONS_16BPP # Support for 16-bit display + +# Mac-specific options +#options DISABLE_EXT_CACHE # If really paranoid, disable IIci ext. cache +#options MRG_ADB # Use ROM-based ADB driver +options ZS_CONSOLE_ABORT + +options NFS_BOOT_DHCP + +# Kernel root file system and dump configuration. +config netbsd root on ? type ? + +# +# Device configuration +# + +mainbus0 at root + +fpu0 at mainbus? # Floating-Point Coprocessor support + + +# Basic Bus Support + +# On-board I/O bus support +obio0 at mainbus? + +# NuBus support +nubus0 at mainbus? + + +# Console Devices + +# Apple Desktop Bus interface +adb0 at obio? +aed* at adb? # ADB event device +akbd* at adb? # ADB keyboard +ams* at adb? # ADB mouse + +# Basic frame buffer support +intvid0 at obio? # Internal video hardware +macvid* at nubus? # NuBus video card + +# Device-independent frame buffer interface +macfb* at intvid? +macfb* at macvid? + +# Workstation Console devices +wsdisplay0 at macfb? console ? +wskbd0 at akbd? console ? +wsmouse0 at ams? + + +# Serial Devices + +# On-board serial interface +zsc0 at obio? +zstty* at zsc? channel ? + + +# SCSI Controllers and Devices + +# SCSI controllers +# XXX - use only one of ncrscsi or sbc +#ncrscsi0 at obio? # SCSI NCR 5380 +sbc0 at obio? flags 0x1 # MI SCSI NCR 5380 +esp0 at obio? # SCSI NCR 53C9x +esp1 at obio? # SCSI NCR 53C9x + +# SCSI bus support +scsibus* at scsi? + +# SCSI devices +sd* at scsibus? target ? lun ? # SCSI disk drives +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +st* at scsibus? target ? lun ? # SCSI tape drives + + +# Miscellaneous mass storage devices + +# IWM floppy disk controller +iwm0 at obio? # Sony driver (800K GCR) +fd* at iwm? drive ? + + +# Network Interfaces + +# On-board Ethernet controllers +sn* at obio? # SONIC-based (DP83932, DP83916) +mc* at obio? # MACE-based + +# NuBus Ethernet controllers +ae* at nubus? # DP8390-based +sn* at nubus? # SONIC-based (DP83932, DP83916) +sm* at nubus? # SMC-based + +nsphy* at mii? phy ? +ukphy* at mii? phy ? + +# Audio Devices + +# On-board audio hardware +asc0 at obio? # ASC/EASC audio + +# Pseudo-Devices + +# disk/mass storage pseudo-devices +pseudo-device md 1 # memory disk device (ramdisk) + +# network pseudo-devices +pseudo-device loop 1 # network loopback +pseudo-device ppp 1 # Point-to-Point Protocol +pseudo-device sl 1 # Serial Line IP + +# miscellaneous pseudo-devices +pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)