From f76d1dd00aa02844a7eef7a1be1992fdd332ff72 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Wed, 30 Oct 2002 12:22:55 +0000 Subject: [PATCH] Tidy up config files: - make GENERIC more generic - add GENERIC_MD, which has MEMORY_DISK stuff and just includes GENERIC - add a call of dbsym(8) in Makefile.dreamcast.inc Approved by marcus. --- sys/arch/dreamcast/conf/GENERIC | 106 ++++++++++++------ sys/arch/dreamcast/conf/GENERIC_MD | 13 +++ .../dreamcast/conf/Makefile.dreamcast.inc | 6 +- 3 files changed, 90 insertions(+), 35 deletions(-) create mode 100644 sys/arch/dreamcast/conf/GENERIC_MD diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC index 07e5ed8a279e..62d9b84746fe 100644 --- a/sys/arch/dreamcast/conf/GENERIC +++ b/sys/arch/dreamcast/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.27 2002/10/14 18:39:30 elric Exp $ +# $NetBSD: GENERIC,v 1.28 2002/10/30 12:22:55 tsutsui Exp $ # # GENERIC machine description file # @@ -24,48 +24,45 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 # estimated number of users -# Enable the hooks used for initializing the root memory-disk. -options MEMORY_DISK_HOOKS -options MEMORY_DISK_IS_ROOT # force root on memory disk -options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=2880 # size of memory disk, in blocks -#options MEMORY_DISK_ROOT_SIZE=6000 - # Standard system options #options UCONSOLE # users can use TIOCCONS (for xconsole) #options INSECURE # disable kernel security levels #options RTC_OFFSET=-540 options HZ=100 # clock interrupt generates every 1/HZ sec -#options NTP # NTP phase/frequency locked loop +options NTP # NTP phase/frequency locked loop -#options KTRACE # system call tracing via ktrace(1) +options KTRACE # system call tracing via ktrace(1) +options SYSTRACE # system call vetting via sistrace(1) options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) -#options SYSVMSG # System V-like message queues -#options SYSVSEM # System V-like semaphores +options SYSVMSG # System V-like message queues +options SYSVSEM # System V-like semaphores #options SEMMNI=10 # number of semaphore identifiers #options SEMMNS=60 # number of semaphores in system #options SEMUME=10 # max number of undo entries per process #options SEMMNU=30 # number of undo structures in system -#options SYSVSHM # System V-like memory sharing +options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default # Diagnostic/debugging support options -#options DIAGNOSTIC # cheap kernel consistency checks +options DIAGNOSTIC # cheap kernel consistency checks #options DEBUG # expensive debugging checks/support -#options DDB # in-kernel debugger +#options KMEMSTATS # kernel memory statistics (vmstat -m) +options DDB # in-kernel debugger #options KGDB # remote debugger #options "KGDB_DEVNAME=\"scif\"",KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table +options SYMTAB_SPACE=180000 #options SYSCALL_DEBUG #options UVMHIST #options UVMHIST_PRINT # Compatibility options options COMPAT_43 # and 4.3BSD +#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. # Executable format options options EXEC_COFF # COFF executables @@ -73,35 +70,66 @@ options EXEC_ELF32 # 32-bit ELF executables # 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 PROCFS # /proc -file-system KERNFS # /kern -#file-system NULLFS # loopback file system -#file-system UMAPFS # NULLFS + uid and gid remapping file-system CD9660 # CD-ROM file system +#file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +file-system PROCFS # /proc +#file-system NULLFS # loopback file system +#file-system OVERLAY # overlay file system +#file-system PORTAL # portal file system (still experimental) +#file-system UMAPFS # NULLFS + uid and gid remapping +#file-system UNION # union file system # File system options #options QUOTA # UFS quotas +#options FFS_EI # FFS Endian Independent supoprt +#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 INET # IP + ICMP + TCP + UDP -options NFS_BOOT_DHCP # Support DHCP NFS root +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 # Deflrate compression support for PPP +#options PPP_FILTER # Active filter support for PPP (requires bpf) +#options PFIL_HOOKS # pfil(9) packet filter hooks +#options IPFILTER_LOG # ipmon(8) log support +#options IPFILTER_DEFAULT_BLOCK # block all packets by default +#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG #options PCIVERBOSE # verbose PCI device autoconfig messages +#options MIIVERBOSE # verbose PHY autoconfig messages #options PCI_CONFIG_DUMP # verbosely dump PCI config space +options NFS_BOOT_DHCP # Support DHCP NFS root + +# wscons options +options WSEMUL_VT100 # VT100 / VT220 emulation +options FONT_BOLD8x16 +#options FONT_SONY8x16 + # Kernel root file system and dump configuration. #config netbsd root on ? type nfs #config netbsd root on wd0a type ffs config netbsd root on ? type ? - -# wscons options -options WSEMUL_VT100 # VT100 / VT220 emulation -options FONT_BOLD8x16 - # # Device configuration # @@ -112,7 +140,7 @@ cpu* at mainbus? shb* at mainbus? # Serial Devices -#options SCIFCONSOLE +#options SCIFCONSOLE options SCIFCN_SPEED=57600 scif0 at shb? @@ -131,16 +159,26 @@ pci* at gapspci? rtk* at pci? dev ? function ? # SEGA Broadband Adapter ukphy* at mii? phy ? -#pseudo-device cgd 4 # cryptographic disk devices -#pseudo-device vnd 4 # disk-like interface to files -#pseudo-device bpfilter 8 # Berkeley packet filter -#pseudo-device bridge # simple inter-network bridging +#pseudo-device cgd 2 # cryptographic disk devices +pseudo-device md 1 # memory disk device (ramdisk) +pseudo-device vnd 2 # disk-like interface to files + +# network pseudo-devices +pseudo-device bpfilter 4 # Berkeley packet filter #pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback -pseudo-device pty # pseudo-terminals -#pseudo-device ppp 2 # Point-to-Point Protocol +#pseudo-device ppp 1 # Point-to-Point Protocol #pseudo-device pppoe # PPP over Ethernet (RFC 2516) -#pseudo-device tun 2 # network tunneling over tty +#pseudo-device sl 1 # Serial Line IP +#pseudo-device tun 1 # network tunneling over tty +#pseudo-device gre 1 # generic L3 over IP tunnel +#pseudo-device gif 1 # 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 +#pseudo-device vlan # IEEE 802.1q encapsulation +#pseudo-device bridge # simple inter-network bridging + +# miscellaneous pseudo-devices +pseudo-device pty # pseudo-terminals pseudo-device rnd # /dev/random and in-kernel generator -pseudo-device md 1 # memory disk device (ramdisk) pseudo-device clockctl # user control of clock subsystem diff --git a/sys/arch/dreamcast/conf/GENERIC_MD b/sys/arch/dreamcast/conf/GENERIC_MD new file mode 100644 index 000000000000..f6fc3da98581 --- /dev/null +++ b/sys/arch/dreamcast/conf/GENERIC_MD @@ -0,0 +1,13 @@ +# $NetBSD: GENERIC_MD,v 1.1 2002/10/30 12:22:55 tsutsui Exp $ +# +# GENERIC_MD config file (GENERIC with memory disk root) +# + +include "arch/dreamcast/conf/GENERIC" + +# Enable the hooks used for initializing the root memory-disk. +options MEMORY_DISK_HOOKS +options MEMORY_DISK_IS_ROOT # force root on memory disk +options MEMORY_DISK_SERVER=0 # no userspace memory disk support +options MEMORY_DISK_ROOT_SIZE=2880 # size of memory disk, in blocks +#options MEMORY_DISK_ROOT_SIZE=6000 diff --git a/sys/arch/dreamcast/conf/Makefile.dreamcast.inc b/sys/arch/dreamcast/conf/Makefile.dreamcast.inc index c82f18240f66..b89bcc67d20b 100644 --- a/sys/arch/dreamcast/conf/Makefile.dreamcast.inc +++ b/sys/arch/dreamcast/conf/Makefile.dreamcast.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.dreamcast.inc,v 1.7 2001/12/09 05:00:43 atatat Exp $ +# $NetBSD: Makefile.dreamcast.inc,v 1.8 2002/10/30 12:22:55 tsutsui Exp $ MACHINE_ARCH=sh3el @@ -6,3 +6,7 @@ TEXTADDR?=8c010000 .if ${OBJECT_FMT} == "ELF" LINKFORMAT= -N .endif + +SYSTEM_LD_TAIL_EXTRA=; \ + echo "${DBSYM} $@ || true"; \ + ${DBSYM} $@ || true