PERFORCE change 30181 for review
Peter Wemm
peter at FreeBSD.org
Wed Apr 30 16:20:38 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30181
Change 30181 by peter at peter_daintree on 2003/04/30 16:19:49
IFC @30180 (after dumbass repo-copy in cvs)
Affected files ...
.. //depot/projects/hammer/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/hammer/sys/conf/Makefile.x86_64#13 delete
.. //depot/projects/hammer/sys/conf/files.amd64#4 integrate
.. //depot/projects/hammer/sys/conf/files.x86_64#19 delete
.. //depot/projects/hammer/sys/conf/options.amd64#4 integrate
.. //depot/projects/hammer/sys/conf/options.x86_64#9 delete
.. //depot/projects/hammer/sys/ia64/include/param.h#4 integrate
Differences ...
==== //depot/projects/hammer/sys/conf/Makefile.amd64#4 (text+ko) ====
@@ -1,18 +1,19 @@
-# Makefile.i386 -- with config changes.
+# Makefile.x86_64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.259 2003/04/15 21:29:11 phk Exp $
+# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.5 2003/04/15 21:29:11 phk Exp $
#
# Makefile for FreeBSD
#
# This makefile is constructed from a machine description:
# config machineid
# Most changes should be made in the machine description
-# /sys/i386/conf/``machineid''
+# /sys/x86_64/conf/``machineid''
# after which you should do
# config machineid
# Generic makefile changes should be made in
-# /sys/conf/Makefile.i386
+# /sys/conf/Makefile.x86_64
# after which config should be rerun for all machines.
#
@@ -30,7 +31,7 @@
.endif
.include "$S/conf/kern.pre.mk"
-MKMODULESENV+= MACHINE=i386
+MKMODULESENV+= MACHINE=x86_64
%BEFORE_DEPEND
==== //depot/projects/hammer/sys/conf/files.amd64#4 (text+ko) ====
@@ -1,125 +1,13 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.444 2003/04/27 05:40:53 imp Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.10 2003/02/28 21:59:13 ru Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
# dependency lines other than the first are silently ignored.
#
-linux_genassym.o optional compat_linux \
- dependency "$S/i386/linux/linux_genassym.c" \
- compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \
- no-obj no-implicit-rule \
- clean "linux_genassym.o"
-#
-linux_assym.h optional compat_linux \
- dependency "$S/kern/genassym.sh linux_genassym.o" \
- compile-with "sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \
- no-obj no-implicit-rule before-depend \
- clean "linux_assym.h"
-#
-svr4_genassym.o optional compat_svr4 \
- dependency "$S/i386/svr4/svr4_genassym.c" \
- compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \
- no-obj no-implicit-rule \
- clean "svr4_genassym.o"
-#
-svr4_assym.h optional compat_svr4 \
- dependency "$S/kern/genassym.sh svr4_genassym.o" \
- compile-with "sh $S/kern/genassym.sh svr4_genassym.o > ${.TARGET}" \
- no-obj no-implicit-rule before-depend \
- clean "svr4_assym.h"
-#
-font.h optional sc_dflt_font \
- compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
- no-obj no-implicit-rule before-depend \
- clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
-#
-atkbdmap.h optional atkbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \
- no-obj no-implicit-rule before-depend \
- clean "atkbdmap.h"
-#
-ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \
- no-obj no-implicit-rule before-depend \
- clean "ukbdmap.h"
-#
-msysosak.o optional fla \
- dependency "$S/contrib/dev/fla/i386/msysosak.o.uu" \
- compile-with "uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu" \
- no-implicit-rule
-#
-trlld.o optional oltr \
- dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
- compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
- no-implicit-rule
-#
-compat/linux/linux_file.c optional compat_linux
-compat/linux/linux_getcwd.c optional compat_linux
-compat/linux/linux_ioctl.c optional compat_linux
-compat/linux/linux_ipc.c optional compat_linux
-compat/linux/linux_mib.c optional compat_linux
-compat/linux/linux_misc.c optional compat_linux
-compat/linux/linux_signal.c optional compat_linux
-compat/linux/linux_socket.c optional compat_linux
-compat/linux/linux_stats.c optional compat_linux
-compat/linux/linux_sysctl.c optional compat_linux
-compat/linux/linux_uid16.c optional compat_linux
-compat/linux/linux_util.c optional compat_linux
-compat/pecoff/imgact_pecoff.c optional pecoff_support
-compat/svr4/imgact_svr4.c optional compat_svr4
-compat/svr4/svr4_fcntl.c optional compat_svr4
-compat/svr4/svr4_filio.c optional compat_svr4
-compat/svr4/svr4_ioctl.c optional compat_svr4
-compat/svr4/svr4_ipc.c optional compat_svr4
-compat/svr4/svr4_misc.c optional compat_svr4
-compat/svr4/svr4_resource.c optional compat_svr4
-compat/svr4/svr4_signal.c optional compat_svr4
-compat/svr4/svr4_socket.c optional compat_svr4
-compat/svr4/svr4_sockio.c optional compat_svr4
-compat/svr4/svr4_stat.c optional compat_svr4
-compat/svr4/svr4_stream.c optional compat_svr4
-compat/svr4/svr4_syscallnames.c optional compat_svr4
-compat/svr4/svr4_sysent.c optional compat_svr4
-compat/svr4/svr4_sysvec.c optional compat_svr4
-compat/svr4/svr4_termios.c optional compat_svr4
-compat/svr4/svr4_ttold.c optional compat_svr4
-contrib/dev/fla/fla.c optional fla
-contrib/dev/oltr/if_oltr.c optional oltr
-contrib/dev/oltr/trlldbm.c optional oltr
-contrib/dev/oltr/trlldhm.c optional oltr
-contrib/dev/oltr/trlldmac.c optional oltr
-bf_enc.o optional ipsec ipsec_esp \
- dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
- compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
- no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp
-crypto/des/des_ecb.c optional netsmbcrypto
-crypto/des/arch/i386/des_enc.S optional netsmbcrypto
-crypto/des/des_setkey.c optional netsmbcrypto
-bf_enc.o optional crypto \
- dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
- compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
- no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional crypto
-crypto/des/des_ecb.c optional crypto
-crypto/des/des_setkey.c optional crypto
-dev/advansys/adv_isa.c optional adv isa
-dev/aic/aic_isa.c optional aic isa
-dev/ar/if_ar.c optional ar
-dev/ar/if_ar_pci.c optional ar pci
-dev/ar/if_ar_isa.c optional ar isa
-dev/cm/if_cm_isa.c optional cm isa
-dev/dgb/dgb.c count dgb
-dev/ed/if_ed_isa.c optional ed isa
-dev/eisa/eisaconf.c optional eisa
-dev/fb/fb.c optional fb
-dev/fb/fb.c optional vga
-dev/fb/splash.c optional splash
-dev/fb/vga.c optional vga
-dev/fe/if_fe_isa.c optional fe isa
+
dev/kbd/atkbd.c optional atkbd
dev/kbd/atkbdc.c optional atkbdc
dev/kbd/kbd.c optional atkbd
@@ -127,13 +15,8 @@
dev/kbd/kbd.c optional sc
dev/kbd/kbd.c optional ukbd
dev/kbd/kbd.c optional vt
-dev/lnc/if_lnc_isa.c optional lnc isa
-dev/sbni/if_sbni.c optional sbni
-dev/sbni/if_sbni_isa.c optional sbni isa
-dev/sbni/if_sbni_pci.c optional sbni pci
dev/sio/sio.c optional sio
dev/sio/sio_isa.c optional sio isa
-dev/sr/if_sr_isa.c optional sr isa
dev/syscons/apm/apm_saver.c optional apm_saver apm
dev/syscons/schistory.c optional sc
dev/syscons/scmouse.c optional sc
@@ -146,278 +29,34 @@
dev/syscons/scvtb.c optional sc
dev/syscons/syscons.c optional sc
dev/syscons/sysmouse.c optional sc
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
-gnu/i386/fpemul/div_small.s optional gpl_math_emulate \
- warning "kernel contains GPL contaminated math emulator"
-gnu/i386/fpemul/errors.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate
-gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate
-gnu/i386/fpemul/get_address.c optional gpl_math_emulate
-gnu/i386/fpemul/load_store.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_div.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate
-gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate
-gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate
-gnu/i386/fpemul/polynomial.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate
-gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_round.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate
-gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate
-gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate
-i386/acpica/OsdEnvironment.c optional acpi
-i386/acpica/acpi_machdep.c optional acpi
-i386/acpica/acpi_wakeup.c optional acpi
-acpi_wakecode.h optional acpi \
- dependency "$S/i386/acpica/acpi_wakecode.S" \
- compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \
- no-obj no-implicit-rule before-depend \
- clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin"
-#
-i386/bios/apm.c optional apm
-i386/bios/mca_machdep.c optional mca
-i386/bios/smapi.c optional smapi
-i386/bios/smapi_bios.S optional smapi
-i386/bios/smbios.c optional smbios
-i386/bios/vpd.c optional vpd
-i386/i386/atomic.c standard \
- compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/i386/autoconf.c standard
-i386/i386/bios.c standard
-i386/i386/bioscall.s standard
-i386/i386/busdma_machdep.c standard
-i386/i386/critical.c standard
-i386/i386/db_disasm.c optional ddb
-i386/i386/db_interface.c optional ddb
-i386/i386/db_trace.c optional ddb
-i386/i386/dump_machdep.c standard
-i386/i386/elan-mmcr.c optional cpu_elan
-i386/i386/elf_machdep.c standard
-i386/i386/exception.s standard
-i386/i386/i386-gdbstub.c optional ddb
-i386/i386/i686_mem.c standard
-i386/i386/identcpu.c standard
-i386/i386/in_cksum.c optional inet
-i386/i386/initcpu.c standard
-i386/i386/k6_mem.c standard
-i386/i386/legacy.c standard
-i386/i386/locore.s standard no-obj
-i386/i386/machdep.c standard
-i386/i386/math_emulate.c optional math_emulate
-i386/i386/mem.c standard
-i386/i386/mp_clock.c optional smp
-i386/i386/mp_machdep.c optional smp
-i386/i386/mpapic.c optional smp
-i386/i386/mpboot.s optional smp
-i386/i386/nexus.c standard
-i386/i386/perfmon.c optional perfmon
-i386/i386/perfmon.c optional perfmon profiling-routine
-i386/i386/pmap.c standard
-i386/i386/support.s standard
-i386/i386/swtch.s standard
-i386/i386/sys_machdep.c standard
-i386/i386/trap.c standard
-i386/i386/tsc.c standard
-i386/i386/vm86.c standard
-i386/i386/vm_machdep.c standard
-i386/ibcs2/ibcs2_errno.c optional ibcs2
-i386/ibcs2/ibcs2_fcntl.c optional ibcs2
-i386/ibcs2/ibcs2_ioctl.c optional ibcs2
-i386/ibcs2/ibcs2_ipc.c optional ibcs2
-i386/ibcs2/ibcs2_isc.c optional ibcs2
-i386/ibcs2/ibcs2_isc_sysent.c optional ibcs2
-i386/ibcs2/ibcs2_misc.c optional ibcs2
-i386/ibcs2/ibcs2_msg.c optional ibcs2
-i386/ibcs2/ibcs2_other.c optional ibcs2
-i386/ibcs2/ibcs2_signal.c optional ibcs2
-i386/ibcs2/ibcs2_socksys.c optional ibcs2
-i386/ibcs2/ibcs2_stat.c optional ibcs2
-i386/ibcs2/ibcs2_sysent.c optional ibcs2
-i386/ibcs2/ibcs2_sysi86.c optional ibcs2
-i386/ibcs2/ibcs2_sysvec.c optional ibcs2
-i386/ibcs2/ibcs2_util.c optional ibcs2
-i386/ibcs2/ibcs2_xenix.c optional ibcs2
-i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
-i386/ibcs2/imgact_coff.c optional ibcs2
-i386/isa/asc.c count asc
-i386/isa/clock.c standard
-i386/isa/cronyx.c optional cx
-i386/isa/ctx.c count ctx
-i386/isa/cx.c count cx
-i386/isa/cy.c count cy
-i386/isa/elink.c optional ep
-i386/isa/elink.c optional ie
-i386/isa/gpib.c optional gp
-i386/isa/gsc.c count gsc
-i386/isa/if_cx.c optional cx
-i386/isa/if_el.c count el
-i386/isa/if_le.c count le
-i386/isa/if_rdp.c count rdp
-i386/isa/intr_machdep.c standard
-i386/isa/ithread.c standard
-i386/isa/isa.c optional isa
-i386/isa/isa_compat.c optional isa compat_oldisa \
- warning "Old ISA driver compatibility shims present."
-i386/isa/isa_dma.c optional isa
-i386/isa/istallion.c optional stli nowerror
-i386/isa/loran.c optional loran
-i386/isa/mse.c optional mse
-i386/isa/npx.c optional npx
-i386/isa/pcaudio.c optional pca
-i386/isa/pcf.c optional pcf
-i386/isa/pcvt/pcvt_drv.c optional vt
-i386/isa/pcvt/pcvt_ext.c optional vt
-i386/isa/pcvt/pcvt_kbd.c optional vt
-i386/isa/pcvt/pcvt_out.c optional vt
-i386/isa/pcvt/pcvt_sup.c optional vt
-i386/isa/pcvt/pcvt_vtf.c optional vt
-i386/isa/pmtimer.c optional pmtimer
-i386/isa/prof_machdep.c optional profiling-routine
-i386/isa/spic.c optional spic
-i386/isa/spigot.c count spigot
-i386/isa/spkr.c optional speaker
-i386/isa/stallion.c optional stl nowerror
-i386/isa/vesa.c optional vga vesa
-i386/isa/wt.c count wt
-i386/linux/imgact_linux.c optional compat_linux
-i386/linux/linux_dummy.c optional compat_linux
-i386/linux/linux_locore.s optional compat_linux \
- dependency "linux_assym.h"
-i386/linux/linux_machdep.c optional compat_linux
-i386/linux/linux_ptrace.c optional compat_linux
-i386/linux/linux_sysent.c optional compat_linux
-i386/linux/linux_sysvec.c optional compat_linux
-i386/pci/pci_cfgreg.c optional pci
-i386/pci/pci_bus.c optional pci
-i386/svr4/svr4_locore.s optional compat_svr4 \
- dependency "svr4_assym.h" \
- warning "COMPAT_SVR4 is broken and should be avoided"
-i386/svr4/svr4_machdep.c optional compat_svr4
-#
-# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc
-#
-i4b/layer1/i4b_hdlc.c optional itjc
-i4b/layer1/i4b_hdlc.c optional ihfc
-i4b/layer1/i4b_l1dmux.c optional isic
-i4b/layer1/i4b_l1lib.c optional isic
-i4b/layer1/i4b_l1dmux.c optional iwic
-i4b/layer1/i4b_l1lib.c optional iwic
-i4b/layer1/i4b_l1dmux.c optional ifpi
-i4b/layer1/i4b_l1lib.c optional ifpi
-i4b/layer1/i4b_l1dmux.c optional ifpi2
-i4b/layer1/i4b_l1lib.c optional ifpi2
-i4b/layer1/i4b_l1dmux.c optional ihfc
-i4b/layer1/i4b_l1lib.c optional ihfc
-i4b/layer1/i4b_l1dmux.c optional ifpnp
-i4b/layer1/i4b_l1lib.c optional ifpnp
-i4b/layer1/i4b_l1dmux.c optional itjc
-i4b/layer1/i4b_l1lib.c optional itjc
-#
-# isdn4bsd, isic
-#
-i4b/layer1/isic/i4b_asuscom_ipac.c optional isic
-i4b/layer1/isic/i4b_avm_a1.c optional isic
-i4b/layer1/isic/i4b_bchan.c optional isic
-i4b/layer1/isic/i4b_ctx_s0P.c optional isic
-i4b/layer1/isic/i4b_drn_ngo.c optional isic
-i4b/layer1/isic/i4b_dynalink.c optional isic
-i4b/layer1/isic/i4b_elsa_qs1i.c optional isic
-i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci
-i4b/layer1/isic/i4b_elsa_pcc16.c optional isic
-i4b/layer1/isic/i4b_hscx.c optional isic
-i4b/layer1/isic/i4b_isac.c optional isic
-i4b/layer1/isic/i4b_isic.c optional isic
-i4b/layer1/isic/i4b_isic_isa.c optional isic
-i4b/layer1/isic/i4b_isic_pnp.c optional isic
-i4b/layer1/isic/i4b_itk_ix1.c optional isic
-i4b/layer1/isic/i4b_l1.c optional isic
-i4b/layer1/isic/i4b_l1fsm.c optional isic
-i4b/layer1/isic/i4b_siemens_isurf.c optional isic
-i4b/layer1/isic/i4b_sws.c optional isic
-i4b/layer1/isic/i4b_tel_s016.c optional isic
-i4b/layer1/isic/i4b_tel_s0163.c optional isic
-i4b/layer1/isic/i4b_tel_s08.c optional isic
-i4b/layer1/isic/i4b_usr_sti.c optional isic
-i4b/layer1/isic/i4b_diva.c optional isic
-#
-# isdn4bsd, iwic
-#
-i4b/layer1/iwic/i4b_iwic_pci.c optional iwic pci
-i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci
-i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci
-i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci
-i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci
-#
-# isdn4bsd, ifpi
-#
-i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi pci
-i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci
-i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci
-i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci
-#
-# isdn4bsd, ifpi2
-#
-i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci
-#
-# isdn4bsd, ifpnp
-#
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp
-#
-# isdn4bsd, ihfc
-#
-i4b/layer1/ihfc/i4b_ihfc_l1if.c optional ihfc
-i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc
-i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc
-#
-# isdn4bsd, itjc
-#
-i4b/layer1/itjc/i4b_itjc_pci.c optional itjc
-i4b/layer1/itjc/i4b_itjc_isac.c optional itjc
-i4b/layer1/itjc/i4b_itjc_l1.c optional itjc
-i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc
-#
isa/atkbd_isa.c optional atkbd
-isa/atkbdc_isa.c optional atkbdc
-isa/fd.c optional fdc
-isa/ppc.c optional ppc
-isa/psm.c optional psm
-isa/syscons_isa.c optional sc
-isa/vga_isa.c optional vga
-kern/imgact_aout.c optional compat_aout
-kern/imgact_gzip.c optional gzip
-libkern/divdi3.c standard
-libkern/moddi3.c standard
-libkern/qdivrem.c standard
-libkern/ucmpdi2.c standard
-libkern/udivdi3.c standard
-libkern/umoddi3.c standard
-pci/cy_pci.c optional cy pci
-pci/agp_intel.c optional agp
-pci/agp_via.c optional agp
-pci/agp_sis.c optional agp
-pci/agp_ali.c optional agp
-pci/agp_amd.c optional agp
-pci/agp_i810.c optional agp
+
+libkern/ffs.c standard
+
+x86_64/x86_64/autoconf.c standard
+x86_64/x86_64/bios.c standard
+x86_64/x86_64/bioscall.s standard
+x86_64/x86_64/busdma_machdep.c standard
+x86_64/x86_64/critical.c standard
+x86_64/x86_64/dump_machdep.c standard
+x86_64/x86_64/elf_machdep.c standard
+x86_64/x86_64/exception.s standard
+x86_64/x86_64/i686_mem.c standard
+x86_64/x86_64/identcpu.c standard
+x86_64/x86_64/initcpu.c standard
+x86_64/x86_64/k6_mem.c standard
+x86_64/x86_64/locore.s standard no-obj
+x86_64/x86_64/machdep.c standard
+x86_64/x86_64/mem.c standard
+x86_64/x86_64/nexus.c standard
+x86_64/x86_64/pmap.c standard
+x86_64/x86_64/support.s standard
+x86_64/x86_64/swtch.s standard
+x86_64/x86_64/sys_machdep.c standard
+x86_64/x86_64/trap.c standard
+x86_64/x86_64/vm86.c standard
+x86_64/x86_64/vm_machdep.c standard
+
+x86_64/isa/clock.c standard
+x86_64/isa/intr_machdep.c standard
+x86_64/isa/ithread.c standard
==== //depot/projects/hammer/sys/conf/options.amd64#4 (text+ko) ====
@@ -1,84 +1,15 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.191 2003/04/12 09:40:37 des Exp $
-# Options specific to the i386 platform kernels
+# $FreeBSD: src/sys/conf/options.amd64,v 1.5 2003/04/12 09:40:37 des Exp $
+# Options specific to the AMD x86-64 platform kernels
-MATH_EMULATE opt_math_emulate.h
-GPL_MATH_EMULATE opt_math_emulate.h
-DISABLE_PSE opt_pmap.h
-PMAP_SHPGPERPROC opt_pmap.h
-DISABLE_PG_G opt_pmap.h
-LAZY_SWITCH opt_swtch.h
-SWTCH_OPTIM_STATS opt_swtch.h
-PPC_PROBE_CHIPSET opt_ppc.h
-PPC_DEBUG opt_ppc.h
MAXMEM
PERFMON opt_perfmon.h
-POWERFAIL_NMI opt_trap.h
-AUTO_EOI_1 opt_auto_eoi.h
-AUTO_EOI_2 opt_auto_eoi.h
-I586_PMC_GUPROF opt_i586_guprof.h
-COMPAT_OLDISA
-BROKEN_KEYBOARD_RESET opt_reset.h
-# Options for emulators. These should only be used at config time, so
-# they are handled like options for static filesystems
-# (see src/sys/conf/options), except for broken debugging options.
-COMPAT_AOUT opt_dontuse.h
-IBCS2 opt_dontuse.h
-COMPAT_LINUX opt_dontuse.h
-COMPAT_SVR4 opt_dontuse.h
-DEBUG_SVR4 opt_svr4.h
-PECOFF_SUPPORT opt_dontuse.h
-PECOFF_DEBUG opt_pecoff.h
-# i386 SMP options
-APIC_IO opt_global.h
-
# Change KVM size. Changes things all over the kernel.
KVA_PAGES opt_global.h
-# Physical address extensions and support for >4G ram. As above.
-PAE opt_global.h
-
-CLK_CALIBRATION_LOOP opt_clock.h
-CLK_USE_I8254_CALIBRATION opt_clock.h
-CLK_USE_TSC_CALIBRATION opt_clock.h
-TIMER_FREQ opt_clock.h
-
-NO_F00F_HACK opt_cpu.h
-CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h
-CPU_BLUELIGHTNING_3X opt_cpu.h
-CPU_BTB_EN opt_cpu.h
-CPU_CYRIX_NO_LOCK opt_cpu.h
-CPU_DIRECT_MAPPED_CACHE opt_cpu.h
-CPU_DISABLE_5X86_LSSER opt_cpu.h
-CPU_ELAN opt_cpu.h
-CPU_FASTER_5X86_FPU opt_cpu.h
-CPU_I486_ON_386 opt_cpu.h
-CPU_IORT opt_cpu.h
-CPU_L2_LATENCY opt_cpu.h
-CPU_LOOP_EN opt_cpu.h
-CPU_PPRO2CELERON opt_cpu.h
-CPU_RSTK_EN opt_cpu.h
-CPU_SUSP_HLT opt_cpu.h
-CPU_UPGRADE_HW_CACHE opt_cpu.h
-CPU_WT_ALLOC opt_cpu.h
-CYRIX_CACHE_WORKS opt_cpu.h
-CYRIX_CACHE_REALLY_WORKS opt_cpu.h
-NO_MEMORY_HOLE opt_cpu.h
-CPU_ENABLE_SSE opt_cpu.h
-CPU_ATHLON_SSE_HACK opt_cpu.h
-CPU_DISABLE_SSE opt_cpu.h
-CPU_DISABLE_CMPXCHG opt_global.h
-
-# Options for the AMD Elan CPU
-ELAN_PPS opt_cpu.h
-ELAN_XTAL opt_cpu.h
+CLK_CALIBRATION_LOOP opt_clock.h
+TIMER_FREQ opt_clock.h
-# The CPU type affects the endian conversion functions all over the kernel.
-I386_CPU opt_global.h
-I486_CPU opt_global.h
-I586_CPU opt_global.h
-I686_CPU opt_global.h
-
MAXCONS opt_syscons.h
SC_ALT_MOUSE_IMAGE opt_syscons.h
SC_CUT_SPACES2TABS opt_syscons.h
@@ -112,10 +43,6 @@
VESA
VESA_DEBUG opt_vesa.h
-PSM_HOOKRESUME opt_psm.h
-PSM_RESETAFTERSUSPEND opt_psm.h
-PSM_DEBUG opt_psm.h
-
ATKBD_DFLT_KEYMAP opt_atkbd.h
KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
@@ -125,65 +52,6 @@
KBD_RESETDELAY opt_kbd.h
KBDIO_DEBUG opt_kbd.h
-EISA_SLOTS opt_eisa.h
-
-# pcvt(4) has a bunch of options
-FAT_CURSOR opt_pcvt.h
-XSERVER opt_pcvt.h
-PCVT_24LINESDEF opt_pcvt.h
-PCVT_CTRL_ALT_DEL opt_pcvt.h
-PCVT_META_ESC opt_pcvt.h
-PCVT_NSCREENS opt_pcvt.h
-PCVT_PRETTYSCRNS opt_pcvt.h
-PCVT_SCANSET opt_pcvt.h
-PCVT_SCREENSAVER opt_pcvt.h
-PCVT_USEKBDSEC opt_pcvt.h
-PCVT_VT220KEYB opt_pcvt.h
-PCVT_GREENSAVER opt_pcvt.h
-
-# Video spigot
-SPIGOT_UNSECURE opt_spigot.h
-
-# -------------------------------
-# isdn4bsd: passive ISA cards
-# -------------------------------
-TEL_S0_8 opt_i4b.h
-TEL_S0_16 opt_i4b.h
-TEL_S0_16_3 opt_i4b.h
-AVM_A1 opt_i4b.h
-USR_STI opt_i4b.h
-ITKIX1 opt_i4b.h
-ELSA_PCC16 opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive ISA PnP cards
-# -------------------------------
-CRTX_S0_P opt_i4b.h
-DRN_NGO opt_i4b.h
-TEL_S0_16_3_P opt_i4b.h
-SEDLBAUER opt_i4b.h
-DYNALINK opt_i4b.h
-ASUSCOM_IPAC opt_i4b.h
-ELSA_QS1ISA opt_i4b.h
-SIEMENS_ISURF2 opt_i4b.h
-EICON_DIVA opt_i4b.h
-COMPAQ_M610 opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive PCI cards
-# -------------------------------
-ELSA_QS1PCI opt_i4b.h
-# -------------------------------
-# isdn4bsd: misc options
-# -------------------------------
-# temporary workaround for SMP machines
-I4B_SMP_WORKAROUND opt_i4b.h
-# enable VJ compression code for ipr i/f
-IPR_VJ opt_i4b.h
-IPR_LOG opt_i4b.h
-
-# Device options
-DEV_NPX opt_npx.h
-DEV_SPLASH opt_splash.h
-
# -------------------------------
# EOF
# -------------------------------
==== //depot/projects/hammer/sys/ia64/include/param.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/ia64/include/param.h,v 1.13 2003/02/17 09:53:29 marcel Exp $ */
+/* $FreeBSD: src/sys/ia64/include/param.h,v 1.14 2003/04/30 23:16:33 marcel Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*
@@ -85,7 +85,6 @@
#ifndef MACHINE_ARCH
#define MACHINE_ARCH "ia64"
#endif
-#define MID_MACHINE MID_IA64
#ifdef SMP
#define MAXCPU 16
More information about the p4-projects
mailing list