[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Wed Jul 25 14:36:32 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/9c6b1283f2d3
changeset: 511:9c6b1283f2d3
user: Aleksandr Rybalko <ray at ddteam.net>
date: Wed Jul 25 17:21:12 2012 +0300
description:
Lazy update
diffstat:
head/sys/conf/Makefile.arm | 4 +-
head/sys/conf/NOTES | 27 +++++++------
head/sys/conf/files | 86 +++++++++++++++++++++++++++++++++++++++----
head/sys/conf/files.amd64 | 5 +-
head/sys/conf/files.arm | 9 ++++-
head/sys/conf/files.i386 | 4 +-
head/sys/conf/files.ia64 | 4 +-
head/sys/conf/files.mips | 3 +-
head/sys/conf/files.powerpc | 28 +++++++------
head/sys/conf/files.sparc64 | 3 +-
head/sys/conf/kern.post.mk | 45 ++++++++++++++++++----
head/sys/conf/kmod.mk | 7 +--
head/sys/conf/options | 7 ++-
head/sys/conf/options.arm | 12 ++---
head/sys/conf/options.mips | 5 +-
head/sys/conf/options.powerpc | 6 ++-
16 files changed, 186 insertions(+), 69 deletions(-)
diffs (818 lines):
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/Makefile.arm
--- a/head/sys/conf/Makefile.arm Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/Makefile.arm Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: head/sys/conf/Makefile.arm 223116 2011-06-15 19:15:50Z cognet $
+# $FreeBSD: head/sys/conf/Makefile.arm 238464 2012-07-15 05:38:43Z imp $
#
# Makefile for FreeBSD
#
@@ -105,7 +105,7 @@
>opt_kernname.h
eval $$(stat -s ${KERNEL_KO}.tmp) && \
echo "#define KERNSIZE $$st_size" >>opt_kernname.h
- gzip -9 ${KERNEL_KO}.tmp
+ gzip -f9 ${KERNEL_KO}.tmp
eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \
echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
${CC} -O2 -ffreestanding -DKZIP -I. -I$S -c $S/kern/inflate.c -o \
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/NOTES
--- a/head/sys/conf/NOTES Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/NOTES Wed Jul 25 17:21:12 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/NOTES 234302 2012-04-14 23:53:31Z davide $
+# $FreeBSD: head/sys/conf/NOTES 237263 2012-06-19 07:34:13Z np $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -545,6 +545,8 @@
options ROUTETABLES=2 # max 16. 1 is back compatible.
+options TCP_OFFLOAD # TCP offload support.
+
# In order to enable IPSEC you MUST also add device crypto to
# your kernel configuration
options IPSEC #IP security (requires device crypto)
@@ -1295,7 +1297,7 @@
device da #SCSI direct access devices (aka disks)
device sa #SCSI tapes
device cd #SCSI CD-ROMs
-device ses #SCSI Environmental Services (and SAF-TE)
+device ses #Enclosure Services (SES and SAF-TE)
device pt #SCSI processor
device targ #SCSI Target Mode Code
device targbh #SCSI Target Mode Blackhole Device
@@ -1305,14 +1307,13 @@
# CAM OPTIONS:
# debugging options:
-# -- NOTE -- If you specify one of the bus/target/lun options, you must
-# specify them all!
-# CAMDEBUG: When defined enables debugging macros
-# CAM_DEBUG_BUS: Debug the given bus. Use -1 to debug all busses.
-# CAM_DEBUG_TARGET: Debug the given target. Use -1 to debug all targets.
-# CAM_DEBUG_LUN: Debug the given lun. Use -1 to debug all luns.
-# CAM_DEBUG_FLAGS: OR together CAM_DEBUG_INFO, CAM_DEBUG_TRACE,
-# CAM_DEBUG_SUBTRACE, and CAM_DEBUG_CDB
+# CAMDEBUG Compile in all possible debugging.
+# CAM_DEBUG_COMPILE Debug levels to compile in.
+# CAM_DEBUG_FLAGS Debug levels to enable on boot.
+# CAM_DEBUG_BUS Limit debugging to the given bus.
+# CAM_DEBUG_TARGET Limit debugging to the given target.
+# CAM_DEBUG_LUN Limit debugging to the given lun.
+# CAM_DEBUG_DELAY Delay in us after printing each debug line.
#
# CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
# SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
@@ -1323,10 +1324,12 @@
# can be changed at boot and runtime with the
# kern.cam.scsi_delay tunable/sysctl.
options CAMDEBUG
+options CAM_DEBUG_COMPILE=-1
+options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
options CAM_DEBUG_BUS=-1
options CAM_DEBUG_TARGET=-1
options CAM_DEBUG_LUN=-1
-options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_TRACE|CAM_DEBUG_CDB)
+options CAM_DEBUG_DELAY=1
options CAM_MAX_HIGHPOWER=4
options SCSI_NO_SENSE_STRINGS
options SCSI_NO_OP_STRINGS
@@ -1603,7 +1606,7 @@
#
# ISP_INTERNAL_TARGET (trivial internal disk target, for testing)
#
-options ISP_DEFAULT_ROLES=2
+options ISP_DEFAULT_ROLES=0
# Options used in dev/sym/ (Symbios SCSI driver).
#options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits)
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files
--- a/head/sys/conf/files Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files Wed Jul 25 17:21:12 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files 234458 2012-04-19 12:30:12Z mav $
+# $FreeBSD: head/sys/conf/files 238710 2012-07-23 03:52:18Z adrian $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -134,7 +134,9 @@
cam/scsi/scsi_pass.c optional pass
cam/scsi/scsi_pt.c optional pt
cam/scsi/scsi_sa.c optional sa
-cam/scsi/scsi_ses.c optional ses
+cam/scsi/scsi_enc.c optional ses
+cam/scsi/scsi_enc_ses.c optional ses
+cam/scsi/scsi_enc_safte.c optional ses
cam/scsi/scsi_sg.c optional sg
cam/scsi/scsi_targ_bh.c optional targbh
cam/scsi/scsi_target.c optional targ
@@ -159,9 +161,11 @@
cddl/compat/opensolaris/kern/opensolaris_zone.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/acl/acl_common.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/avl/avl.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/nvpair/nvpair.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/unicode/u8_textprep.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfeature_common.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/zfs/zfs_comutil.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/zfs/zfs_deleg.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c optional zfs compile-with "${ZFS_C}"
@@ -175,6 +179,7 @@
cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c optional zfs compile-with "${ZFS_C}"
@@ -226,6 +231,7 @@
cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c optional zfs compile-with "${ZFS_C}"
@@ -406,6 +412,7 @@
contrib/dev/acpica/components/tables/tbinstal.c optional acpi
contrib/dev/acpica/components/tables/tbutils.c optional acpi
contrib/dev/acpica/components/tables/tbxface.c optional acpi
+contrib/dev/acpica/components/tables/tbxfload.c optional acpi
contrib/dev/acpica/components/tables/tbxfroot.c optional acpi
contrib/dev/acpica/components/utilities/utaddress.c optional acpi
contrib/dev/acpica/components/utilities/utalloc.c optional acpi
@@ -415,6 +422,7 @@
contrib/dev/acpica/components/utilities/utdecode.c optional acpi
contrib/dev/acpica/components/utilities/utdelete.c optional acpi
contrib/dev/acpica/components/utilities/uteval.c optional acpi
+contrib/dev/acpica/components/utilities/utexcep.c optional acpi
contrib/dev/acpica/components/utilities/utglobal.c optional acpi
contrib/dev/acpica/components/utilities/utids.c optional acpi
contrib/dev/acpica/components/utilities/utinit.c optional acpi
@@ -570,6 +578,7 @@
dev/aac/aac_pci.c optional aac pci
dev/acpi_support/acpi_wmi.c optional acpi_wmi acpi
dev/acpi_support/acpi_asus.c optional acpi_asus acpi
+dev/acpi_support/acpi_asus_wmi.c optional acpi_asus_wmi acpi
dev/acpi_support/acpi_fujitsu.c optional acpi_fujitsu acpi
dev/acpi_support/acpi_hp.c optional acpi_hp acpi
dev/acpi_support/acpi_ibm.c optional acpi_ibm acpi
@@ -711,6 +720,8 @@
#
dev/ath/if_ath.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_beacon.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_debug.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_keycache.c optional ath \
@@ -719,10 +730,18 @@
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_tx.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_tx_edma.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_tx_ht.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_tdma.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_sysctl.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_rx.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_rx_edma.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/ah_osdep.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
#
@@ -1012,6 +1031,7 @@
dev/bwi/if_bwi.c optional bwi
dev/bwi/if_bwi_pci.c optional bwi pci
dev/bwn/if_bwn.c optional bwn siba_bwn
+dev/bwn/if_bwn.c optional bwn siba
dev/bxe/if_bxe.c optional bxe
dev/bxe/bxe_link.c optional bxe
dev/cardbus/cardbus.c optional cardbus
@@ -1031,8 +1051,6 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci \
compile-with "${NORMAL_C} -I$S/dev/cxgb"
-dev/cxgb/cxgb_offload.c optional cxgb pci \
- compile-with "${NORMAL_C} -I$S/dev/cxgb"
dev/cxgb/cxgb_sge.c optional cxgb pci \
compile-with "${NORMAL_C} -I$S/dev/cxgb"
dev/cxgb/common/cxgb_mc5.c optional cxgb pci \
@@ -1184,6 +1202,8 @@
compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/e1000_ich8lan.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_i210.c optional em | igb \
+ compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/e1000_api.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/e1000_mac.c optional em | igb \
@@ -1218,6 +1238,7 @@
dev/fb/splash.c optional splash
dev/fdt/fdt_common.c optional fdt
dev/fdt/fdt_pci.c optional fdt pci
+dev/fdt/fdt_slicer.c optional fdt cfi | fdt nand
dev/fdt/fdt_static_dtb.S optional fdt fdt_dtb_static
dev/fdt/fdtbus.c optional fdt
dev/fdt/simplebus.c optional fdt
@@ -1515,7 +1536,7 @@
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
dev/ixgbe/ixgbe.c optional ixgbe inet \
- compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP -DIXGBE_FDIR"
dev/ixgbe/ixv.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_phy.c optional ixgbe inet \
@@ -1662,6 +1683,21 @@
dev/mxge/mxge_rss_eth_z8e.c optional mxge pci
dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci
dev/my/if_my.c optional my
+dev/nand/nand.c optional nand
+dev/nand/nand_bbt.c optional nand
+dev/nand/nand_cdev.c optional nand
+dev/nand/nand_generic.c optional nand
+dev/nand/nand_geom.c optional nand
+dev/nand/nand_id.c optional nand
+dev/nand/nandbus.c optional nand
+dev/nand/nandbus_if.m optional nand
+dev/nand/nand_if.m optional nand
+dev/nand/nandsim.c optional nandsim nand
+dev/nand/nandsim_chip.c optional nandsim nand
+dev/nand/nandsim_ctrl.c optional nandsim nand
+dev/nand/nandsim_log.c optional nandsim nand
+dev/nand/nandsim_swap.c optional nandsim nand
+dev/nand/nfc_if.m optional nand
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
dev/netmap/netmap.c optional netmap
@@ -2268,6 +2304,20 @@
fs/msdosfs/msdosfs_lookup.c optional msdosfs
fs/msdosfs/msdosfs_vfsops.c optional msdosfs
fs/msdosfs/msdosfs_vnops.c optional msdosfs
+fs/nandfs/bmap.c optional nandfs
+fs/nandfs/nandfs_alloc.c optional nandfs
+fs/nandfs/nandfs_bmap.c optional nandfs
+fs/nandfs/nandfs_buffer.c optional nandfs
+fs/nandfs/nandfs_cleaner.c optional nandfs
+fs/nandfs/nandfs_cpfile.c optional nandfs
+fs/nandfs/nandfs_dat.c optional nandfs
+fs/nandfs/nandfs_dir.c optional nandfs
+fs/nandfs/nandfs_ifile.c optional nandfs
+fs/nandfs/nandfs_segment.c optional nandfs
+fs/nandfs/nandfs_subr.c optional nandfs
+fs/nandfs/nandfs_sufile.c optional nandfs
+fs/nandfs/nandfs_vfsops.c optional nandfs
+fs/nandfs/nandfs_vnops.c optional nandfs
fs/nfs/nfs_commonkrpc.c optional nfscl | nfsd
fs/nfs/nfs_commonsubs.c optional nfscl | nfsd
fs/nfs/nfs_commonport.c optional nfscl | nfsd
@@ -2369,6 +2419,7 @@
geom/geom_dump.c standard
geom/geom_event.c standard
geom/geom_fox.c optional geom_fox
+geom/geom_flashmap.c optional fdt cfi | fdt nand
geom/geom_io.c standard
geom/geom_kern.c standard
geom/geom_map.c optional geom_map
@@ -2413,6 +2464,7 @@
geom/raid/g_raid_ctl.c optional geom_raid
geom/raid/g_raid_md_if.m optional geom_raid
geom/raid/g_raid_tr_if.m optional geom_raid
+geom/raid/md_ddf.c optional geom_raid
geom/raid/md_intel.c optional geom_raid
geom/raid/md_jmicron.c optional geom_raid
geom/raid/md_nvidia.c optional geom_raid
@@ -2538,12 +2590,14 @@
kern/kern_proc.c standard
kern/kern_prot.c standard
kern/kern_racct.c standard
+kern/kern_rangelock.c standard
kern/kern_rctl.c standard
kern/kern_resource.c standard
kern/kern_rmlock.c standard
kern/kern_rwlock.c standard
kern/kern_sdt.c optional kdtrace_hooks
kern/kern_sema.c standard
+kern/kern_sharedpage.c standard
kern/kern_shutdown.c standard
kern/kern_sig.c standard
kern/kern_switch.c standard
@@ -2570,7 +2624,7 @@
kern/serdev_if.m standard
kern/stack_protector.c standard \
compile-with "${NORMAL_C:N-fstack-protector*}"
-kern/subr_acl_nfs4.c optional ufs_acl
+kern/subr_acl_nfs4.c optional ufs_acl | zfs
kern/subr_acl_posix1e.c optional ufs_acl
kern/subr_autoconf.c standard
kern/subr_blist.c standard
@@ -3012,7 +3066,7 @@
netinet/tcp_input.c optional inet | inet6
netinet/tcp_lro.c optional inet | inet6
netinet/tcp_output.c optional inet | inet6
-netinet/tcp_offload.c optional inet | inet6
+netinet/tcp_offload.c optional tcp_offload inet | tcp_offload inet6
netinet/tcp_reass.c optional inet | inet6
netinet/tcp_sack.c optional inet | inet6
netinet/tcp_subr.c optional inet | inet6
@@ -3516,7 +3570,6 @@
vm/swap_pager.c standard
vm/uma_core.c standard
vm/uma_dbg.c standard
-vm/vm_contig.c standard
vm/memguard.c optional DEBUG_MEMGUARD
vm/vm_fault.c standard
vm/vm_glue.c standard
@@ -3699,3 +3752,20 @@
dev/xen/netfront/netfront.c optional xen | xenhvm
dev/xen/xenpci/xenpci.c optional xenpci
dev/xen/xenpci/evtchn.c optional xenpci
+
+dev/etherswitch/mdio_if.m optional miiproxy
+dev/etherswitch/mdio.c optional miiproxy
+dev/etherswitch/miiproxy.c optional miiproxy
+
+dev/etherswitch/etherswitch.c optional etherswitch
+dev/etherswitch/etherswitch_if.m optional etherswitch
+
+dev/etherswitch/rtl8366/rtl8366rb.c optional rtl8366rb
+
+dev/etherswitch/arswitch/arswitch.c optional arswitch
+dev/etherswitch/arswitch/arswitch_reg.c optional arswitch
+dev/etherswitch/arswitch/arswitch_phy.c optional arswitch
+dev/etherswitch/arswitch/arswitch_8216.c optional arswitch
+dev/etherswitch/arswitch/arswitch_8226.c optional arswitch
+dev/etherswitch/arswitch/arswitch_8316.c optional arswitch
+dev/etherswitch/arswitch/arswitch_7240.c optional arswitch
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.amd64
--- a/head/sys/conf/files.amd64 Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.amd64 Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.amd64 234118 2012-04-11 02:42:01Z marcel $
+# $FreeBSD: head/sys/conf/files.amd64 236830 2012-06-10 02:38:51Z iwasaki $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -72,7 +72,6 @@
no-implicit-rule
#
amd64/acpica/acpi_machdep.c optional acpi
-amd64/acpica/acpi_switch.S optional acpi
acpi_wakecode.o optional acpi \
dependency "$S/amd64/acpica/acpi_wakecode.S assym.s" \
compile-with "${NORMAL_S}" \
@@ -94,7 +93,6 @@
no-obj no-implicit-rule before-depend \
clean "acpi_wakedata.h"
#
-amd64/acpica/acpi_wakeup.c optional acpi
amd64/amd64/amd64_mem.c optional mem
#amd64/amd64/apic_vector.S standard
amd64/amd64/atomic.c standard
@@ -454,6 +452,7 @@
#
x86/acpica/OsdEnvironment.c optional acpi
x86/acpica/acpi_apm.c optional acpi
+x86/acpica/acpi_wakeup.c optional acpi
x86/acpica/madt.c optional acpi
x86/acpica/srat.c optional acpi
x86/bios/smbios.c optional smbios
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.arm
--- a/head/sys/conf/files.arm Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.arm Wed Jul 25 17:21:12 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files.arm 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/files.arm 237433 2012-06-22 07:06:40Z kib $
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
arm/arm/autoconf.c standard
@@ -78,3 +78,10 @@
#XXX: We can't use these versions, as strcmp.c is included conf/files
#libkern/arm/strcmp.S standard
#libkern/arm/strncmp.S standard
+#
+kern/subr_dummy_vdso_tc.c standard
+board_id.h standard \
+ dependency "$S/arm/conf/genboardid.awk $S/arm/conf/mach-types" \
+ compile-with "${AWK} -f $S/arm/conf/genboardid.awk $S/arm/conf/mach-types > board_id.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "board_id.h"
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.i386
--- a/head/sys/conf/files.i386 Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.i386 Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.i386 234118 2012-04-11 02:42:01Z marcel $
+# $FreeBSD: head/sys/conf/files.i386 236830 2012-06-10 02:38:51Z iwasaki $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -381,7 +381,6 @@
no-obj no-implicit-rule before-depend \
clean "acpi_wakedata.h"
#
-i386/acpica/acpi_wakeup.c optional acpi
i386/bios/apm.c optional apm
i386/bios/mca_machdep.c optional mca
i386/bios/smapi.c optional smapi
@@ -505,6 +504,7 @@
#
x86/acpica/OsdEnvironment.c optional acpi
x86/acpica/acpi_apm.c optional acpi
+x86/acpica/acpi_wakeup.c optional acpi
x86/acpica/madt.c optional acpi apic
x86/acpica/srat.c optional acpi
x86/bios/smbios.c optional smbios
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.ia64
--- a/head/sys/conf/files.ia64 Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.ia64 Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.ia64 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/files.ia64 238184 2012-07-07 00:25:17Z marcel $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -98,6 +98,7 @@
ia64/ia64/nexus.c standard
ia64/ia64/pal.S standard
ia64/ia64/physical.S standard
+ia64/ia64/physmem.c standard
ia64/ia64/pmap.c standard
ia64/ia64/ptrace_machdep.c standard
ia64/ia64/sal.c standard
@@ -138,3 +139,4 @@
libkern/ia64/bswap32.S standard
libkern/memmove.c standard
libkern/memset.c standard
+kern/subr_dummy_vdso_tc.c standard
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.mips
--- a/head/sys/conf/files.mips Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.mips Wed Jul 25 17:21:12 2012 +0300
@@ -14,7 +14,7 @@
# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc.
# All rights reserved.
# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
-# $FreeBSD: head/sys/conf/files.mips 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/files.mips 237433 2012-06-22 07:06:40Z kib $
#
# ----------------------------------------------------------------------
# Phase 2
@@ -91,6 +91,7 @@
compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32
compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32
kern/imgact_elf32.c optional compat_freebsd32
+kern/subr_dummy_vdso_tc.c standard
mips/mips/freebsd32_machdep.c optional compat_freebsd32
kern/kern_clocksource.c standard
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.powerpc
--- a/head/sys/conf/files.powerpc Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.powerpc Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.powerpc 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/files.powerpc 238046 2012-07-03 01:00:29Z marcel $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -35,6 +35,7 @@
dev/iicbus/ds1775.c optional ds1775 powermac
dev/iicbus/max6690.c optional max6690 powermac
dev/kbd/kbd.c optional sc
+dev/nand/nfc_fsl.c optional nand mpc85xx
dev/ofw/openfirm.c optional aim | fdt
dev/ofw/openfirmio.c optional aim | fdt
dev/ofw/ofw_bus_if.m optional aim | fdt
@@ -61,6 +62,7 @@
dev/tsec/if_tsec_fdt.c optional tsec fdt
dev/uart/uart_cpu_powerpc.c optional uart aim
kern/kern_clocksource.c standard
+kern/subr_dummy_vdso_tc.c standard
kern/syscalls.c optional ktr
libkern/ashldi3.c optional powerpc
libkern/ashrdi3.c optional powerpc
@@ -97,17 +99,18 @@
powerpc/aim/trap.c optional aim
powerpc/aim/uma_machdep.c optional aim
powerpc/aim/vm_machdep.c optional aim
-powerpc/booke/clock.c optional e500
-powerpc/booke/copyinout.c optional e500
-powerpc/booke/interrupt.c optional e500
-powerpc/booke/locore.S optional e500 no-obj
-powerpc/booke/machdep.c optional e500
-powerpc/booke/mp_cpudep.c optional e500 smp
+powerpc/booke/clock.c optional booke
+powerpc/booke/copyinout.c optional booke
+powerpc/booke/interrupt.c optional booke
+powerpc/booke/locore.S optional booke no-obj
+powerpc/booke/machdep.c optional booke
+powerpc/booke/machdep_e500.c optional booke_e500
+powerpc/booke/mp_cpudep.c optional booke smp
powerpc/booke/platform_bare.c optional mpc85xx
-powerpc/booke/pmap.c optional e500
-powerpc/booke/swtch.S optional e500
-powerpc/booke/trap.c optional e500
-powerpc/booke/vm_machdep.c optional e500
+powerpc/booke/pmap.c optional booke
+powerpc/booke/swtch.S optional booke
+powerpc/booke/trap.c optional booke
+powerpc/booke/vm_machdep.c optional booke
powerpc/cpufreq/dfs.c optional cpufreq
powerpc/cpufreq/pcr.c optional cpufreq aim
powerpc/fpu/fpu_add.c optional fpu_emu powerpc
@@ -132,7 +135,6 @@
powerpc/mpc85xx/lbc.c optional mpc85xx
powerpc/mpc85xx/mpc85xx.c optional mpc85xx
powerpc/mpc85xx/nexus.c optional mpc85xx
-powerpc/mpc85xx/openpic_fdt.c optional fdt
powerpc/mpc85xx/pci_fdt.c optional pci mpc85xx
powerpc/ofw/ofw_cpu.c optional aim
powerpc/ofw/ofw_machdep.c optional aim
@@ -170,7 +172,6 @@
powerpc/powermac/vcoregpio.c optional powermac
powerpc/powermac/windtunnel.c optional powermac windtunnel
powerpc/powerpc/altivec.c optional aim
-powerpc/powerpc/atomic.S standard
powerpc/powerpc/autoconf.c standard
powerpc/powerpc/bcopy.c standard
powerpc/powerpc/bus_machdep.c standard
@@ -195,6 +196,7 @@
powerpc/powerpc/mmu_if.m standard
powerpc/powerpc/mp_machdep.c optional smp
powerpc/powerpc/openpic.c standard
+powerpc/powerpc/openpic_fdt.c optional fdt
powerpc/powerpc/pic_if.m standard
powerpc/powerpc/pmap_dispatch.c standard
powerpc/powerpc/platform.c standard
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/files.sparc64
--- a/head/sys/conf/files.sparc64 Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/files.sparc64 Wed Jul 25 17:21:12 2012 +0300
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.sparc64 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/files.sparc64 237433 2012-06-22 07:06:40Z kib $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -61,6 +61,7 @@
dev/uart/uart_cpu_sparc64.c optional uart
dev/uart/uart_kbd_sun.c optional uart sc
kern/kern_clocksource.c standard
+kern/subr_dummy_vdso_tc.c standard
kern/syscalls.c optional ktr
libkern/ffs.c standard
libkern/ffsl.c standard
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/kern.post.mk
--- a/head/sys/conf/kern.post.mk Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/kern.post.mk Wed Jul 25 17:21:12 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/kern.post.mk 233578 2012-03-27 21:23:56Z peter $
+# $FreeBSD: head/sys/conf/kern.post.mk 238050 2012-07-03 05:01:00Z obrien $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -36,13 +36,44 @@
.endif
.endfor
-# Handle out of tree ports
+# Handle ports (as defined by the user) that build kernel modules
.if !defined(NO_MODULES) && defined(PORTS_MODULES)
-PORTSMODULESENV=SYSDIR=${SYSDIR}
-.for __target in all install reinstall clean
+#
+# The ports tree needs some environment variables defined to match the new kernel
+#
+# Ports search for some dependencies in PATH, so add the location of the installed files
+LOCALBASE?= /usr/local
+# SRC_BASE is how the ports tree refers to the location of the base source files
+.if !defined(SRC_BASE)
+SRC_BASE!= realpath "${SYSDIR:H}/"
+.endif
+# OSVERSION is used by some ports to determine build options
+.if !defined(OSRELDATE)
+# Definition copied from src/Makefile.inc1
+OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
+.endif
+# Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build
+WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+PORTSMODULESENV=\
+ PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
+ SRC_BASE=${SRC_BASE} \
+ OSVERSION=${OSRELDATE} \
+ WRKDIRPREFIX=${WRKDIRPREFIX}
+
+# The WRKDIR needs to be cleaned before building, and trying to change the target
+# with a :C pattern below results in install -> instclean
+all:
+.for __i in ${PORTS_MODULES}
+ @${ECHO} "===> Ports module ${__i} (all)"
+ cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all
+.endfor
+
+.for __target in install reinstall clean
${__target}: ports-${__target}
ports-${__target}:
.for __i in ${PORTS_MODULES}
+ @${ECHO} "===> Ports module ${__i} (${__target})"
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
.endfor
.endfor
@@ -239,8 +270,7 @@
.endif
mkdir -p ${DESTDIR}${KODIR}
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
-.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && \
- (defined(MK_KERNEL_SYMBOLS) && ${MK_KERNEL_SYMBOLS} != "no")
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
.if defined(KERNEL_EXTRA_INSTALL)
@@ -252,8 +282,7 @@
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
-.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && \
- (defined(MK_KERNEL_SYMBOLS) && ${MK_KERNEL_SYMBOLS} != "no")
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/kmod.mk
--- a/head/sys/conf/kmod.mk Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/kmod.mk Wed Jul 25 17:21:12 2012 +0300
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: head/sys/conf/kmod.mk 233644 2012-03-29 02:54:35Z jmallett $
+# $FreeBSD: head/sys/conf/kmod.mk 238050 2012-07-03 05:01:00Z obrien $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -283,8 +283,7 @@
_kmodinstall:
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
-.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && \
- (defined(MK_KERNEL_SYMBOLS) && ${MK_KERNEL_SYMBOLS} != "no")
+.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
.endif
@@ -354,7 +353,7 @@
dev/spibus/spibus_if.m kern/bus_if.m kern/clock_if.m \
kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \
libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \
- pc98/pc98/canbus_if.m
+ pc98/pc98/canbus_if.m dev/etherswitch/mdio_if.m
.for _srcsrc in ${MFILES}
.for _ext in c h
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/options
--- a/head/sys/conf/options Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/options Wed Jul 25 17:21:12 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/options 234231 2012-04-13 18:00:48Z adrian $
+# $FreeBSD: head/sys/conf/options 237522 2012-06-24 07:01:49Z adrian $
#
# On the handling of kernel options
#
@@ -213,6 +213,7 @@
FFS opt_dontuse.h
HPFS opt_dontuse.h
MSDOSFS opt_dontuse.h
+NANDFS opt_dontuse.h
NTFS opt_dontuse.h
NULLFS opt_dontuse.h
NWFS opt_dontuse.h
@@ -305,6 +306,7 @@
# Generic SCSI options.
CAM_MAX_HIGHPOWER opt_cam.h
CAMDEBUG opt_cam.h
+CAM_DEBUG_COMPILE opt_cam.h
CAM_DEBUG_DELAY opt_cam.h
CAM_DEBUG_BUS opt_cam.h
CAM_DEBUG_TARGET opt_cam.h
@@ -440,7 +442,7 @@
ROUTETABLES opt_route.h
SLIP_IFF_OPTS opt_slip.h
TCPDEBUG
-TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading
+TCP_OFFLOAD opt_inet.h # Enable code to dispatch TCP offloading
TCP_SIGNATURE opt_inet.h
VLAN_ARRAY opt_vlan.h
XBONEHACK
@@ -792,6 +794,7 @@
ATH_ENABLE_11N opt_ath.h
ATH_ENABLE_DFS opt_ath.h
ATH_EEPROM_FIRMWARE opt_ath.h
+ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h
# options for the Atheros hal
AH_SUPPORT_AR5416 opt_ah.h
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/options.arm
--- a/head/sys/conf/options.arm Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/options.arm Wed Jul 25 17:21:12 2012 +0300
@@ -1,11 +1,10 @@
-#$FreeBSD: head/sys/conf/options.arm 234004 2012-04-07 23:47:08Z stas $
+#$FreeBSD: head/sys/conf/options.arm 238189 2012-07-07 05:02:39Z imp $
ARM9_CACHE_WRITE_THROUGH opt_global.h
ARM_CACHE_LOCK_ENABLE opt_global.h
ARMFPE opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
+ARM_MANY_BOARD opt_global.h
ARM_USE_SMALL_ALLOC opt_global.h
-AT91C_MASTER_CLOCK opt_global.h
-AT91C_MAIN_CLOCK opt_at91.h
COUNTS_PER_SEC opt_timer.h
CPU_SA1100 opt_global.h
CPU_SA1110 opt_global.h
@@ -18,13 +17,14 @@
CPU_XSCALE_IXP435 opt_global.h
CPU_XSCALE_PXA2X0 opt_global.h
FLASHADDR opt_global.h
+FREEBSD_BOOT_LOADER opt_global.h
IXP4XX_FLASH_SIZE opt_global.h
KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
+LINUX_BOOT_ABI opt_global.h
LOADERRAMADDR opt_global.h
PHYSADDR opt_global.h
QEMU_WORKAROUNDS opt_global.h
-SKYEYE_WORKAROUNDS opt_global.h
SOC_MV_DISCOVERY opt_global.h
SOC_MV_KIRKWOOD opt_global.h
SOC_MV_ORION opt_global.h
@@ -33,10 +33,8 @@
XSACLE_DISABLE_CCNT opt_timer.h
VERBOSE_INIT_ARM opt_global.h
AT91_ATE_USE_RMII opt_at91.h
-AT91_BWCT opt_at91.h
-AT91_TSC opt_at91.h
-AT91_KWIKBYTE opt_at91.h
AT91_MCI_HAS_4WIRE opt_at91.h
AT91_MCI_SLOT_B opt_at91.h
+AT91C_MAIN_CLOCK opt_at91.h
CPU_FA526 opt_global.h
CPU_FA626TE opt_global.h
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/options.mips
--- a/head/sys/conf/options.mips Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/options.mips Wed Jul 25 17:21:12 2012 +0300
@@ -26,7 +26,7 @@
# SUCH DAMAGE.
#
# JNPR: options.mips,v 1.2 2006/09/15 12:52:34
-# $FreeBSD: head/sys/conf/options.mips 232896 2012-03-12 21:25:32Z jmallett $
+# $FreeBSD: head/sys/conf/options.mips 234862 2012-05-01 06:18:30Z adrian $
CPU_MIPS4KC opt_global.h
CPU_MIPS32 opt_global.h
@@ -67,7 +67,8 @@
#
# Options that control the Atheros SoC peripherals
#
-ARGE_DEBUG opt_global.h
+ARGE_DEBUG opt_arge.h
+ARGE_MDIO opt_arge.h
#
# Options that control the Ralink RT305xF Etherenet MAC.
diff -r 32bcaf443245 -r 9c6b1283f2d3 head/sys/conf/options.powerpc
--- a/head/sys/conf/options.powerpc Wed Jul 25 17:18:25 2012 +0300
+++ b/head/sys/conf/options.powerpc Wed Jul 25 17:21:12 2012 +0300
@@ -1,8 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/conf/options.powerpc 236141 2012-05-27 10:25:20Z raj $
# Options specific to the powerpc platform kernels
AIM opt_global.h
-E500 opt_global.h
+BOOKE opt_global.h
+BOOKE_E500 opt_global.h
+BOOKE_PPC4XX opt_global.h
CELL
POWERPC
More information about the Zrouter-src-freebsd
mailing list