Date: Fri, 20 Feb 2004 11:29:49 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 47284 for review Message-ID: <200402201929.i1KJTn8H012889@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=47284 Change 47284 by jhb@jhb_slimer on 2004/02/20 11:29:17 IFC @47282. Affected files ... .. //depot/projects/smpng/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/boot/alpha/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#4 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/alpha/loader/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/efi/Makefile.inc#6 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/efi/loader/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.s#7 delete .. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/ia64/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.s#4 delete .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.s#3 delete .. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/smpng/sys/boot/sparc64/boot1/_start.s#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#48 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#19 integrate .. //depot/projects/smpng/sys/conf/files.i386#54 integrate .. //depot/projects/smpng/sys/conf/files.pc98#52 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#18 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#34 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#29 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#27 integrate .. //depot/projects/smpng/sys/conf/ldscript.alpha#4 integrate .. //depot/projects/smpng/sys/conf/majors#36 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#9 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#35 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#18 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#22 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#59 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#38 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#12 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#15 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#9 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/smpng/sys/dev/cx/ng_cx.h#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#13 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#13 integrate .. //depot/projects/smpng/sys/dev/ida/idavar.h#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/ips/ips_disk.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#28 integrate .. //depot/projects/smpng/sys/dev/led/led.c#5 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/mlx/mlxvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#10 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#9 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#12 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#26 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#35 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#18 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#46 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#46 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#46 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#20 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#10 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#31 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#5 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#8 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#13 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/smpng/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/smpng/sys/geom/geom.h#35 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#33 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#3 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#37 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#12 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#29 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#38 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#20 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#24 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#14 integrate .. //depot/projects/smpng/sys/isa/fd.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#16 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#33 integrate .. //depot/projects/smpng/sys/kern/tty.c#40 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#24 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#47 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#68 integrate .. //depot/projects/smpng/sys/libkern/bcmp.c#4 integrate .. //depot/projects/smpng/sys/modules/Makefile#70 integrate .. //depot/projects/smpng/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/geom/geom_concat/Makefile#1 branch .. //depot/projects/smpng/sys/modules/harp/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/lnc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/osf1/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/patm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/pecoff/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.c#31 integrate .. //depot/projects/smpng/sys/net/bridge.c#23 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.h#3 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#48 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#51 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#19 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#36 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#48 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#43 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#39 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#28 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#8 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#29 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#30 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#15 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.h#10 integrate .. //depot/projects/smpng/sys/netinet6/ipsec6.h#5 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#27 integrate .. //depot/projects/smpng/sys/netipsec/key.c#9 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#3 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#14 integrate .. //depot/projects/smpng/sys/pci/agp.c#17 integrate .. //depot/projects/smpng/sys/powerpc/include/floatingpoint.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#1 branch .. //depot/projects/smpng/sys/sys/jail.h#9 integrate .. //depot/projects/smpng/sys/sys/kernel.h#22 integrate .. //depot/projects/smpng/sys/sys/libkern.h#13 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#34 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#50 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#18 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#56 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#47 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#42 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -3,71 +3,32 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# (XXX from i386:NOTES,v 1.1106; merge in updates) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.3 2004/02/08 00:39:38 peter Exp $ +# +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $ # -# We don't have modules on amd64. -makeoptions NO_MODULES=not_yet - # # This directive is mandatory; it defines the architecture to be # configured for; in this case, the 386 family based IBM-PC and # compatibles. # machine amd64 +cpu HAMMER # # We want LINT to cover profiling as well -#X#profile 2 +profile 2 -##################################################################### -# SMP OPTIONS: -# -# The apic device enables the use of the I/O APIC for interrupt delivery. -# The apic device can be used in both UP and SMP kernels, but is required -# for SMP kernels. Thus, the apic device is not strictly an SMP option, -# but it is a prerequisite for SMP. -# -# Notes: -# -# Be sure to disable 'cpu I386_CPU' for SMP kernels. -# -# By default, mixed mode is used to route IRQ0 from the AT timer via -# the 8259A master PIC through the ExtINT pin on the first I/O APIC. -# This can be disabled via the NO_MIXED_MODE option. In that case, -# IRQ0 will be routed via an intpin on the first I/O APIC. Not all -# motherboards hook IRQ0 up to the first I/O APIC even though their -# MP table or MADT may claim to do so. That is why mixed mode is -# enabled by default. -# +# Debug options +options NPX_DEBUG # enable npx debugging (FPU/math emu) + #new math emulator -# Optional: -device atpic -device mptable -options NO_MIXED_MODE # Disable use of mixed mode - - -##################################################################### -# CPU OPTIONS - -# -# You must specify at least one CPU (the one you intend to run on); -# deleting the specification for CPUs you don't need to use may make -# parts of the system run faster. -# -cpu HAMMER - -# -# Options for CPU features. # - -# # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -#X#options PERFMON +options PERFMON ##################################################################### @@ -104,17 +65,14 @@ options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - -options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION - ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS +hint.speaker.0.at="isa" +hint.speaker.0.port="0x61" device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! +device apm_saver # Requires APM ##################################################################### @@ -151,9 +109,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options AUTO_EOI_1 -#options AUTO_EOI_2 - options MAXMEM=(128*1024) #options BROKEN_KEYBOARD_RESET @@ -178,19 +133,7 @@ # Optional devices: # -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. # -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -#X#options TDFX_LINUX # Enable Linuxulator support - -# # ACPI support using the Intel ACPI Component Architecture reference # implementation. # @@ -199,29 +142,17 @@ # Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER # defined when it is built). # -# ACPI_MAX_THREADS sets the number of task threads started. -# -# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. -# -# ACPICA_PEDANTIC enables strict checking of AML. Our default is to -# relax these checks to allow code generated by the Microsoft compiler -# to still execute. -# # Note that building ACPI into the kernel is deprecated; the module is # normally loaded automatically by the loader. # device acpi options ACPI_DEBUG -options ACPI_MAX_THREADS=1 -#!options ACPI_NO_SEMAPHORES -#!options ACPICA_PEDANTIC # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # r128drm: ATI Rage 128 # radeondrm: ATI Radeon up to 9000/9100 -# sisdrm: SiS 300/305,540,630 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee # DRM_DEBUG: include debug printfs, very slow # # mga requires AGP in the kernel, and it is recommended @@ -230,30 +161,70 @@ device mgadrm device "r128drm" device radeondrm -device sisdrm device tdfxdrm options DRM_DEBUG +# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README +###device fla +###hint.fla.0.at="isa" + # # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 +# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) +# (requires miibus) +# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; +# Intel EtherExpress +# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and +# Am79C960) +# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# wl: Lucent Wavelan (ISA card only). + +# Order for ISA/EISA devices is important here -#X#device ath -#X#device ath_hal # Atheros HAL (includes binary component) -device wlan # 802.11 layer +device ed +#options ED_NO_MIIBUS # Disable ed miibus support +hint.ed.0.at="isa" +hint.ed.0.port="0x280" +hint.ed.0.irq="5" +hint.ed.0.maddr="0xd8000" +device lnc +hint.lnc.0.at="isa" +hint.lnc.0.port="0x280" +hint.lnc.0.irq="10" +hint.lnc.0.drq="0" +device sr +hint.sr.0.at="isa" +hint.sr.0.port="0x300" +hint.sr.0.irq="5" +hint.sr.0.maddr="0xd0000" +device wl +hint.wl.0.at="isa" +hint.wl.0.port="0x300" +options WLCACHE # enables the signal-strength cache +options WLDEBUG # enables verbose debugging output # # ATA raid adapters # -#XXX this stores pointers in a 32bit field that is defined by the hardware -#device pst +device pst # # SCSI host adapters: -# +# +# ncv: NCR 53C500 based SCSI host adapters. +# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. +# stg: TMC 18C30, 18C50 based SCSI host adapters. + +device ncv +device nsp +device stg +hint.stg.0.at="isa" +hint.stg.0.port="0x140" +hint.stg.0.port="11" # # Adaptec FSA RAID controllers, including integrated DELL controllers, @@ -278,7 +249,12 @@ # # Miscellaneous hardware: # +# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # digi: Digiboard driver +# gsc: Genius GS-4500 hand scanner. +# spic: Sony Programmable I/O controller (VAIO notebooks) +# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) +# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -286,6 +262,15 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. +# Notes on the Digiboard PC/Xi and PC/Xe series driver +# +# The NDGBPORTS option specifies the number of ports controlled by the +# dgb(4) driver. The default value is 16 ports per device. +# +# The following flag values have special meanings in dgb: +# 0x01 - alternate layout of pins +# 0x02 - use the windowed PC/Xe in 64K mode + device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -304,13 +289,20 @@ # # Laptop/Notebook options: # +# See also: +# apm under `Miscellaneous hardware' +# above. - +# PCI bus Cards: +# -------------- # -# I2C Bus -# - -#--------------------------------------------------------------------------- +# Cyclades Cyclom-Y PCI serial driver +device cy +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#hint.cy.0.at="isa" +#hint.cy.0.irq="10" +#hint.cy.0.maddr="0xd4000" +#hint.cy.0.msize="0x2000" # # Set the number of PV entries per process. Increasing this can @@ -323,52 +315,48 @@ # # The value below is the one more than the default. # -options PMAP_SHPGPERPROC=201 +#options PMAP_SHPGPERPROC=201 + +# +# Change the size of the kernel virtual address space. Due to +# constraints in loader(8) on i386, this must be a multiple of 4. +# 256 = 1 GB of kernel address space. Increasing this also causes +# a reduction of the address space in user processes. 512 splits +# the 4GB cpu address space in half (2GB user, 2GB kernel). +# +options KVA_PAGES=260 ##################################################################### # ABI Emulation -#XXX keep these here for now and reactivate when support for emulating -#XXX these 32 bit binaries is added. - -# Enable iBCS2 runtime support for SCO and ISC binaries -#X#options IBCS2 - -# Emulate spx device for client side of SVR3 local X interface -#X#options SPX_HACK - # Enable Linux ABI emulation -#X#options COMPAT_LINUX +#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#X#options LINPROCFS +#options LINPROCFS -# -# SysVR4 ABI emulation -# -# The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a -# module. If loaded as a module, it must be loaded before the svr4 module -# (the /usr/sbin/svr4 script does this for you). If compiling statically, -# the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured -# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 -# script understands that it doesn't need to load the `streams' module under -# those circumstances. -# Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). -# -#X#options COMPAT_SVR4 # build emulator statically -#X#options DEBUG_SVR4 # enable verbose debugging -#X#device streams # STREAMS network driver (required for svr4). - ##################################################################### # VM OPTIONS +# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the +# kernel to use a 4 MByte pages to map the kernel instead of 4k pages. +# This saves on the amount of memory needed for page tables needed to +# map the kernel. You should only disable this feature as a temporary +# workaround if you are having problems with it enabled. +# +#options DISABLE_PSE + +# Disable the global pages PGE CPU feature. The PGE feature allows pages +# to be marked with the PG_G bit. TLB entries for these pages are not +# flushed from the cache when %cr3 is reloaded. This can make context +# switches less expensive. You should only disable this feature as a +# temporary workaround if you are having problems with it enabled. +# +#options DISABLE_PG_G + # KSTACK_PAGES is the number of memory pages to assign to the kernel # stack of each thread. @@ -381,10 +369,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT -#X#options PECOFF_DEBUG - options ENABLE_ALART options KBDIO_DEBUG=2 options KBD_MAXRETRY=4 @@ -398,25 +382,3 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE - -############################################################### -# Broken stuff that shouldn't really be broken - -# machine/ioctl_meteor.h and machine/bt848.h -nodevice bktr - -# pointer/int stuff -nodevice mgadrm -nodevice "r128drm" -nodevice radeondrm -nodevice sisdrm -nodevice tdfxdrm - -# missing conf lines (must be fixed ASAP) -nooption SC_DFLT_FONT -nooption UKBD_DFLT_KEYMAP -nooption ATKBD_DFLT_KEYMAP -nooption PMAP_SHPGPERPROC -nooption CLK_USE_I8254_CALIBRATION -# XXX dead option -nooption CLK_USE_TSC_CALIBRATION ==== //depot/projects/smpng/sys/boot/alpha/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,12 @@ -# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.8 2000/10/27 09:36:34 dfr Exp $ +# $FreeBSD: src/sys/boot/alpha/Makefile.inc,v 1.9 2004/02/11 22:01:16 ru Exp $ # Options used when building app-specific libalpha components + +BINDIR?= /boot + +CFLAGS+= -ffreestanding -mno-fp-regs +LDFLAGS+= -nostdlib PRIMARY_LOAD_ADDRESS= 0x20000000 # "Region 1 start" SECONDARY_LOAD_ADDRESS= 0x2000c000 # "Region 1 start" + 48k HEAP_LIMIT= 0x20040000 # "Region 1 start" + 256k -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand LIBALPHA= ${.OBJDIR}/../libalpha/libalpha.a ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#7 (text+ko) ==== @@ -1,44 +1,29 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.16 2003/01/26 14:32:53 phk Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.17 2004/02/11 22:01:17 ru Exp $ -.include <../Makefile.inc> +PROG= boot1.sym +INTERNALPROG= +NOMAN= +LINKS= ${BINDIR}/boot1 ${BINDIR}/boot -PROG = boot1 -LINKS = ${BINDIR}/${PROG} ${BINDIR}/boot - -.PATH: ${.CURDIR}/../libalpha +.PATH: ${.CURDIR}/../libalpha SRCS= start.S boot1.c -CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${LIBSTANDDIR} -CFLAGS+= -I${.CURDIR}/.. -NOMAN=1 -STRIP= -BINDIR?= /boot +CFLAGS+= -I${.CURDIR}/../../common BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS} -CLEANFILES+= ${PROG}.sym ${PROG}.nosym ${PROG}.list +CLEANFILES= boot1 -all: ${PROG} +FILES= boot1 -${PROG}.nosym: ${PROG}.sym - cp ${PROG}.sym ${PROG}.nosym - strip ${PROG}.nosym +boot1: boot1.sym + objcopy -S -O binary boot1.sym ${.TARGET} -${PROG}: ${PROG}.nosym - objcopy -O binary ${PROG}.nosym ${PROG} +LDFLAGS=-Ttext ${BOOT_RELOC} -N -e start +DPADD= ${LIBALPHA} ${LIBSTAND} +LDADD= ${LIBALPHA} -lstand .include <bsd.prog.mk> - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -${PROG}.sym: ${OBJS} ${LIBKERN} - ${LD} -M -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym ${OBJS} \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBSTAND} \ - > ${.OBJDIR}/${PROG}.list - size ${PROG}.sym ==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#4 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.7 2002/05/10 09:26:28 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= cdboot -PROG= ${BASE} +BOOT= cdboot NOMAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} -CFLAGS+= -ffreestanding -DLOADER_CDROM_SUPPORT +CFLAGS+= -DLOADER_CDROM_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#4 (text+ko) ==== @@ -1,95 +1,69 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.17 2003/02/26 06:18:52 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.18 2004/02/11 22:01:17 ru Exp $ # # Common Alpha loader build rules -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR}/../common + +PROG= ${BOOT}.sym +INTERNALPROG= # Alpha-specific bootstrap sources -SRCS+= main.c conf.c -.if ${BASE} == netboot +SRCS= start.S main.c conf.c vers.c +.if ${BOOT} == "netboot" SRCS+= dev_net.c .endif +.PATH: ${.CURDIR}/../libalpha + .if !defined(NOFORTH) # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha -.if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a -.else -LIBFICL= ${.CURDIR}/../../ficl/libficl.a -.endif .endif # Always add MI sources -.PATH: ${.CURDIR}/../../common -.include <${.CURDIR}/../../common/Makefile.inc> -CFLAGS+= -mno-fp-regs -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../.. -I. +.PATH: ${.CURDIR}/../../common +.include "${.CURDIR}/../../common/Makefile.inc" +CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS} \ -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \ - vers.c vers.o ${BASE} ${BASE}.sym ${BASE}.list +CLEANFILES+= vers.c ${BOOT} ${BOOT}.sym CFLAGS+= -Wall CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CRT= start.o -STRIP= -BINDIR?= /boot -INSTALLFLAGS?= -b + +vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version + sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} + +LDFLAGS=-e start -N -Ttext ${LOAD_ADDRESS} -all: ${BASE} ${BASE}.help +FILES= ${BOOT} +# XXX INSTALLFLAGS_${BOOT}= -b +FILESMODE_${BOOT}= ${BINMODE} -b -vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version - sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} - ${CC} -c vers.c +${BOOT}: ${BOOT}.sym + objcopy -O binary ${BOOT}.sym ${.TARGET} -${BASE}: ${OBJS} ${LIBSTAND} ${LIBFICL} ${LIBALPHA} ${CRT} vers.o - ${LD} -o ${BASE}.sym -M -e start -N -Ttext ${LOAD_ADDRESS} \ - ${CRT} ${OBJS} vers.o \ - -L${DESTDIR}${LIBDIR} ${LIBSTAND} ${LIBALPHA} ${LIBFICL} ${LIBSTAND} \ - >${.OBJDIR}/${BASE}.list - objcopy -O binary ${BASE}.sym ${BASE} +DPADD= ${LIBALPHA} ${LIBFICL} ${LIBSTAND} +LDADD= ${LIBALPHA} ${LIBFICL} -lstand -CLEANFILES+= ${BASE}.help -${BASE}.help: help.common help.alpha +.if defined(INSTALL_HELP) +FILES+= ${BOOT}.help +CLEANFILES+= ${BOOT}.help +${BOOT}.help: help.common help.alpha cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.endif -beforeinstall: -.ifdef INSTALL_HELP -.if exists(${.OBJDIR}/${BASE}.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif -.endif +.PATH: ${.CURDIR}/../../forth .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults +FILES+= loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults - -start.o: ${.CURDIR}/../libalpha/start.S - ${CC} -c ${CFLAGS} $< - -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - -CLEANFILES+= machine - .include <bsd.prog.mk> - -beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#4 (text+ko) ==== @@ -1,29 +1,17 @@ -# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.13 2002/05/13 10:53:24 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.14 2004/02/11 22:01:17 ru Exp $ LIB= alpha INTERNALLIB= true -CFLAGS+= -ffreestanding #CFLAGS+= -DDISK_DEBUG -#CPPFLAGS+= -DNO_DISKLABEL -#CPPFLAGS+= -DSAVE_MEMORY -# XXX hack to pick up stand.h -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -CFLAGS+= -DDEBUG CFLAGS+= -I${LIBSTANDDIR} # Pick up the bootstrap header for some interface items -CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ - -I${.CURDIR}/../../.. -I. +CFLAGS+= -I${.CURDIR}/../../common SRCS= OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S \ pal.S reboot.c delay.c time.c alpha_module.c devicename.c \ srmdisk.c srmnet.c getsecs.c alpha_copy.c bootinfo.c -machine: - ln -sf ${.CURDIR}/../../../alpha/include machine - .include <bsd.lib.mk> - -beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/alpha/loader/Makefile#3 (text+ko) ==== @@ -1,12 +1,11 @@ -# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.7 2002/05/10 09:26:29 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/loader/Makefile,v 1.8 2004/02/11 22:01:17 ru Exp $ -BASE= loader -PROG= ${BASE} +BOOT= loader NEWVERSWHAT= "SRM disk boot" alpha INSTALL_HELP= yes LOAD_ADDRESS= ${SECONDARY_LOAD_ADDRESS} # Only disk support -CFLAGS+= -ffreestanding -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT +CFLAGS+= -DLOADER_DISK_SUPPORT # -DLOADER_EXT2FS_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#3 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.10 2002/05/10 09:26:29 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/netboot/Makefile,v 1.11 2004/02/11 22:01:17 ru Exp $ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ -BASE= netboot -PROG= ${BASE} +BOOT= netboot NOMAN= NEWVERSWHAT= "SRM net boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} -CFLAGS+= -ffreestanding -DLOADER_NET_SUPPORT +CFLAGS+= -DLOADER_NET_SUPPORT -.include <${.CURDIR}/../common/Makefile.common> - +.include "${.CURDIR}/../common/Makefile.common" ==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#6 (text+ko) ==== @@ -1,4 +1,7 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.6 2002/12/10 04:20:15 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.7 2004/02/12 08:10:33 ru Exp $ + +BINDIR?= /boot # Options used when building app-specific efi components CFLAGS+= -ffreestanding -fshort-wchar -Wformat +LDFLAGS+= -nostdlib ==== //depot/projects/smpng/sys/boot/efi/libefi/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.12 2003/07/02 11:53:55 ru Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.14 2004/02/13 04:43:41 marcel Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} @@ -12,28 +12,16 @@ SRCS+= efifpswa.c .endif -CFLAGS+= -ffreestanding -fpic CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402201929.i1KJTn8H012889>