diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2015-09-05 18:36:23 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2015-09-05 18:36:23 +0000 |
commit | d9442b10a2e14c1c55f21743fa7a653e9b241e05 (patch) | |
tree | c2636bec23985b92b33023a5ca2e324f89604bfa /sys/conf | |
parent | 4ca9a88ad0c8fd1dc753c2fa5b4f4e9f7e09f46c (diff) | |
parent | 1f8577e633d3c2759d29326457deb34935adfd6f (diff) | |
download | src-d9442b10a2e14c1c55f21743fa7a653e9b241e05.tar.gz src-d9442b10a2e14c1c55f21743fa7a653e9b241e05.zip |
Merge ^/head r286858 through r287489.
Notes
Notes:
svn path=/projects/clang-trunk/; revision=287490
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 6 | ||||
-rw-r--r-- | sys/conf/files | 17 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
-rw-r--r-- | sys/conf/files.arm64 | 9 | ||||
-rw-r--r-- | sys/conf/files.powerpc | 2 | ||||
-rw-r--r-- | sys/conf/kmod.mk | 9 | ||||
-rw-r--r-- | sys/conf/options | 10 | ||||
-rw-r--r-- | sys/conf/options.arm64 | 4 | ||||
-rw-r--r-- | sys/conf/options.powerpc | 1 |
9 files changed, 42 insertions, 18 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 7bc20483dfc3..05ffe5560a62 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2985,8 +2985,10 @@ options MAXFILES=999 #options RANDOM_YARROW # Yarrow CSPRNG (old default) #options RANDOM_LOADABLE # Allow the algorithm to be loaded as # a module. -# For developers. -options RANDOM_DEBUG # Extra debugging messages +# Select this to allow high-rate but potentially expensive +# harvesting of Slab-Allocator entropy. In very high-rate +# situations the value of doing this is dubious at best. +options RANDOM_ENABLE_UMA # slab allocator # Module to enable execution of application via emulators like QEMU options IMAGACT_BINMISC diff --git a/sys/conf/files b/sys/conf/files index dfe9763568fb..280f6a69cdd1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -401,7 +401,7 @@ contrib/dev/acpica/components/parser/psxface.c optional acpi contrib/dev/acpica/components/resources/rsaddr.c optional acpi contrib/dev/acpica/components/resources/rscalc.c optional acpi contrib/dev/acpica/components/resources/rscreate.c optional acpi -contrib/dev/acpica/components/resources/rsdump.c optional acpi +contrib/dev/acpica/components/resources/rsdump.c optional acpi acpi_debug contrib/dev/acpica/components/resources/rsdumpinfo.c optional acpi contrib/dev/acpica/components/resources/rsinfo.c optional acpi contrib/dev/acpica/components/resources/rsio.c optional acpi @@ -1236,6 +1236,7 @@ t5fw.fw optional cxgbe \ dev/cy/cy.c optional cy dev/cy/cy_isa.c optional cy isa dev/cy/cy_pci.c optional cy pci +dev/cyapa/cyapa.c optional cyapa smbus dev/dc/if_dc.c optional dc pci dev/dc/dcphy.c optional dc pci dev/dc/pnphy.c optional dc pci @@ -1461,8 +1462,8 @@ dev/hptiop/hptiop.c optional hptiop scbus dev/hwpmc/hwpmc_logging.c optional hwpmc dev/hwpmc/hwpmc_mod.c optional hwpmc dev/hwpmc/hwpmc_soft.c optional hwpmc -dev/ichiic/ig4_iic.c optional ichiic -dev/ichiic/ig4_pci.c optional ichiic pci +dev/ichiic/ig4_iic.c optional ig4 smbus +dev/ichiic/ig4_pci.c optional ig4 pci smbus dev/ichsmb/ichsmb.c optional ichsmb dev/ichsmb/ichsmb_pci.c optional ichsmb pci dev/ida/ida.c optional ida @@ -1557,6 +1558,7 @@ dev/iscsi_initiator/isc_soc.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_sm.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_subr.c optional iscsi_initiator scbus dev/ismt/ismt.c optional ismt +dev/isl/isl.c optional isl smbus dev/isp/isp.c optional isp dev/isp/isp_freebsd.c optional isp dev/isp/isp_library.c optional isp @@ -2086,6 +2088,13 @@ dev/ofw/ofw_iicbus.c optional fdt iicbus dev/ofw/ofwbus.c optional fdt dev/ofw/openfirm.c optional fdt dev/ofw/openfirmio.c optional fdt +dev/ow/ow.c optional ow \ + dependency "owll_if.h" \ + dependency "own_if.h" +dev/ow/owll_if.m optional ow +dev/ow/own_if.m optional ow +dev/ow/ow_temp.c optional ow_temp +dev/ow/owc_gpiobus.c optional owc gpio dev/patm/if_patm.c optional patm pci dev/patm/if_patm_attach.c optional patm pci dev/patm/if_patm_intr.c optional patm pci @@ -2323,6 +2332,7 @@ dev/random/fortuna.c optional random !random_yarrow !random_loadable dev/random/hash.c optional random random_yarrow | \ random !random_yarrow !random_loadable dev/rc/rc.c optional rc +dev/rccgpio/rccgpio.c optional rccgpio gpio dev/re/if_re.c optional re dev/rl/if_rl.c optional rl pci dev/rndtest/rndtest.c optional rndtest @@ -3426,6 +3436,7 @@ libkern/zlib.c optional crypto | geom_uzip | ipsec | \ ddb_ctf | gzio | geom_uncompress net/altq/altq_cbq.c optional altq net/altq/altq_cdnr.c optional altq +net/altq/altq_codel.c optional altq net/altq/altq_hfsc.c optional altq net/altq/altq_fairq.c optional altq net/altq/altq_priq.c optional altq diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 8451e0071fa3..bd708254a9b5 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -205,6 +205,8 @@ dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io +dev/ioat/ioat.c optional ioat pci +dev/ioat/ioat_test.c optional ioat pci dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_acpi.c optional ipmi acpi dev/ipmi/ipmi_isa.c optional ipmi isa diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 72db5623e21c..399a35ec0663 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -50,21 +50,24 @@ arm64/arm64/uma_machdep.c standard arm64/arm64/unwind.c optional ddb | kdtrace_hooks | stack arm64/arm64/vfp.c standard arm64/arm64/vm_machdep.c standard -arm64/cavium/thunder_pcie.c optional thunder_pci fdt -arm64/cavium/thunder_pcie_pem.c optional thunder_pci -arm64/cavium/thunder_pcie_common.c optional thunder_pci +arm64/cavium/thunder_pcie.c optional soc_cavm_thunderx pci fdt +arm64/cavium/thunder_pcie_pem.c optional soc_cavm_thunderx pci +arm64/cavium/thunder_pcie_common.c optional soc_cavm_thunderx pci crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/acpica/acpi_if.m optional acpi dev/fdt/fdt_arm64.c optional fdt dev/hwpmc/hwpmc_arm64.c optional hwpmc dev/hwpmc/hwpmc_arm64_md.c optional hwpmc +dev/mmc/host/dwmmc.c optional dwmmc +dev/mmc/host/dwmmc_hisi.c optional dwmmc soc_hisi_hi6220 dev/ofw/ofw_cpu.c optional fdt dev/pci/pci_host_generic.c optional pci fdt dev/psci/psci.c optional psci dev/psci/psci_arm64.S optional psci dev/uart/uart_cpu_fdt.c optional uart fdt dev/uart/uart_dev_pl011.c optional uart pl011 +dev/usb/controller/dwc_otg_hisi.c optional dwcotg soc_hisi_hi6220 kern/kern_clocksource.c standard kern/subr_dummy_vdso_tc.c standard libkern/bcmp.c standard diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index f44ba74e7b89..d647accf80b9 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -129,9 +129,11 @@ powerpc/mambo/mambocall.S optional mambo powerpc/mambo/mambo.c optional mambo powerpc/mambo/mambo_console.c optional mambo powerpc/mambo/mambo_disk.c optional mambo +powerpc/mikrotik/platform_rb.c optional mikrotik powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/ds1553_bus_fdt.c optional ds1553 fdt powerpc/mpc85xx/ds1553_core.c optional ds1553 +powerpc/mpc85xx/fsl_sdhc.c optional mpc85xx sdhc powerpc/mpc85xx/i2c.c optional iicbus fdt powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 87451df3f915..7e3bc432121d 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -360,11 +360,10 @@ __MPATH!=find ${SYSDIR:tA}/ -name \*_if.m _MPATH=${__MPATH:H:O:u} .endif .PATH.m: ${_MPATH} -.for _s in ${SRCS:M*_if.[ch]} -.if eixsts(${_s:R}.m}) -CLEANFILES+= ${_s} -.endif -.endfor # _s +.for _i in ${SRCS:M*_if.[ch]} +#removes too much, comment out until it's more constrained. +#CLEANFILES+= ${_i} +.endfor # _i .m.c: ${SYSDIR}/tools/makeobjops.awk ${AWK} -f ${SYSDIR}/tools/makeobjops.awk ${.IMPSRC} -c diff --git a/sys/conf/options b/sys/conf/options index 30bbc53bd5a2..936abc95a229 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -388,6 +388,7 @@ ACCEPT_FILTER_HTTP ALTQ opt_global.h ALTQ_CBQ opt_altq.h ALTQ_CDNR opt_altq.h +ALTQ_CODEL opt_altq.h ALTQ_DEBUG opt_altq.h ALTQ_HFSC opt_altq.h ALTQ_FAIRQ opt_altq.h @@ -944,17 +945,16 @@ RACCT_DEFAULT_TO_DISABLED opt_global.h RCTL opt_global.h # Random number generator(s) -# The DEBUG option is in global.h as the random harvesting -# puts probes all over the place, and it makes little sense -# to pollute these headers with an extra include. -RANDOM_DEBUG opt_random.h -# Which CSPRNG hashes we get. +# Which CSPRNG hash we get. # If Yarrow is not chosen, Fortuna is selected. RANDOM_YARROW opt_random.h # With this, no entropy processor is loaded, but the entropy # harvesting infrastructure is present. This means an entropy # processor may be loaded as a module. RANDOM_LOADABLE opt_random.h +# This turns on high-rate and potentially expensive harvesting in +# the uma slab allocator. +RANDOM_ENABLE_UMA opt_global.h # Intel em(4) driver EM_MULTIQUEUE opt_em.h diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64 index 4965940d222d..bc42c825e4ce 100644 --- a/sys/conf/options.arm64 +++ b/sys/conf/options.arm64 @@ -5,3 +5,7 @@ SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h THUNDERX_PASS_1_1_ERRATA opt_global.h VFP opt_global.h + +# SoC Support +SOC_CAVM_THUNDERX opt_soc.h +SOC_HISI_HI6220 opt_soc.h diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc index e3f024dd6a65..4926947c7da7 100644 --- a/sys/conf/options.powerpc +++ b/sys/conf/options.powerpc @@ -32,3 +32,4 @@ OFWCONS_POLL_HZ opt_ofw.h # AGP debugging support AGP_DEBUG opt_agp.h +MIKROTIK |