aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.mips2
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/files49
-rw-r--r--sys/conf/files.amd644
-rw-r--r--sys/conf/files.arm641
-rw-r--r--sys/conf/files.i3864
-rw-r--r--sys/conf/kern.pre.mk2
-rw-r--r--sys/conf/newvers.sh33
-rw-r--r--sys/conf/options5
-rw-r--r--sys/conf/options.riscv2
10 files changed, 94 insertions, 10 deletions
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index d1e692390803..de006c018e6d 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -52,6 +52,8 @@ CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
TRAMP_ARCH_FLAGS?=$(ARCH_FLAGS)
TRAMP_EXTRA_FLAGS=${EXTRA_FLAGS} ${TRAMP_ARCH_FLAGS}
+# Kernel code is always compiled with soft-float on MIPS
+TRAMP_EXTRA_FLAGS+=-msoft-float
.if ${MACHINE_ARCH:Mmips64*} != ""
TRAMP_ELFSIZE=64
.else
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f964d256a61b..ebb7d4245454 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1903,6 +1903,7 @@ device amphy # AMD AM79c873 / Davicom DM910{1,2}
device atphy # Attansic/Atheros F1
device axphy # Asix Semiconductor AX88x9x
device bmtphy # Broadcom BCM5201/BCM5202 and 3Com 3c905C
+device bnxt # Broadcom NetXtreme-C/NetXtreme-E
device brgphy # Broadcom BCM54xx/57xx 1000baseTX
device ciphy # Cicada/Vitesse CS/VSC8xxx
device e1000phy # Marvell 88E1000 1000/100/10-BT
@@ -1943,6 +1944,7 @@ device xmphy # XaQti XMAC II
# BCM570x family of controllers, including the 3Com 3c996-T,
# the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
# the embedded gigE NICs on Dell PowerEdge 2550 servers.
+# bnxt: Broadcom NetXtreme-C and NetXtreme-E PCIe 10/25/50G Ethernet adapters.
# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
# adapters.
# bwi: Broadcom BCM430* and BCM431* family of wireless adapters.
diff --git a/sys/conf/files b/sys/conf/files
index 7a92df184c73..07bbfb8c41c6 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1242,6 +1242,10 @@ dev/bktr/bktr_i2c.c optional bktr pci smbus
dev/bktr/bktr_os.c optional bktr pci
dev/bktr/bktr_tuner.c optional bktr pci
dev/bktr/msp34xx.c optional bktr pci
+dev/bnxt/bnxt_hwrm.c optional bnxt iflib pci
+dev/bnxt/bnxt_sysctl.c optional bnxt iflib pci
+dev/bnxt/bnxt_txrx.c optional bnxt iflib pci
+dev/bnxt/if_bnxt.c optional bnxt iflib pci
dev/buslogic/bt.c optional bt
dev/buslogic/bt_eisa.c optional bt eisa
dev/buslogic/bt_isa.c optional bt isa
@@ -1398,6 +1402,7 @@ dev/dcons/dcons.c optional dcons
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
dev/de/if_de.c optional de pci
+dev/dme/if_dme.c optional dme
dev/dpt/dpt_eisa.c optional dpt eisa
dev/dpt/dpt_pci.c optional dpt pci
dev/dpt/dpt_scsi.c optional dpt
@@ -1466,6 +1471,49 @@ dev/drm/via_map.c optional viadrm
dev/drm/via_mm.c optional viadrm
dev/drm/via_verifier.c optional viadrm
dev/drm/via_video.c optional viadrm
+dev/drm2/drm_agpsupport.c optional drm2
+dev/drm2/drm_auth.c optional drm2
+dev/drm2/drm_bufs.c optional drm2
+dev/drm2/drm_buffer.c optional drm2
+dev/drm2/drm_context.c optional drm2
+dev/drm2/drm_crtc.c optional drm2
+dev/drm2/drm_crtc_helper.c optional drm2
+dev/drm2/drm_dma.c optional drm2
+dev/drm2/drm_dp_helper.c optional drm2
+dev/drm2/drm_dp_iic_helper.c optional drm2
+dev/drm2/drm_drv.c optional drm2
+dev/drm2/drm_edid.c optional drm2
+dev/drm2/drm_fb_helper.c optional drm2
+dev/drm2/drm_fops.c optional drm2
+dev/drm2/drm_gem.c optional drm2
+dev/drm2/drm_gem_names.c optional drm2
+dev/drm2/drm_global.c optional drm2
+dev/drm2/drm_hashtab.c optional drm2
+dev/drm2/drm_ioctl.c optional drm2
+dev/drm2/drm_irq.c optional drm2
+dev/drm2/drm_linux_list_sort.c optional drm2
+dev/drm2/drm_lock.c optional drm2
+dev/drm2/drm_memory.c optional drm2
+dev/drm2/drm_mm.c optional drm2
+dev/drm2/drm_modes.c optional drm2
+dev/drm2/drm_pci.c optional drm2
+dev/drm2/drm_scatter.c optional drm2
+dev/drm2/drm_stub.c optional drm2
+dev/drm2/drm_sysctl.c optional drm2
+dev/drm2/drm_vm.c optional drm2
+dev/drm2/drm_os_freebsd.c optional drm2
+dev/drm2/ttm/ttm_agp_backend.c optional drm2
+dev/drm2/ttm/ttm_lock.c optional drm2
+dev/drm2/ttm/ttm_object.c optional drm2
+dev/drm2/ttm/ttm_tt.c optional drm2
+dev/drm2/ttm/ttm_bo_util.c optional drm2
+dev/drm2/ttm/ttm_bo.c optional drm2
+dev/drm2/ttm/ttm_bo_manager.c optional drm2
+dev/drm2/ttm/ttm_execbuf_util.c optional drm2
+dev/drm2/ttm/ttm_memory.c optional drm2
+dev/drm2/ttm/ttm_page_alloc.c optional drm2
+dev/drm2/ttm/ttm_bo_vm.c optional drm2
+dev/drm2/ati_pcigart.c optional drm2 agp pci
dev/ed/if_ed.c optional ed
dev/ed/if_ed_novell.c optional ed
dev/ed/if_ed_rtl80x9.c optional ed
@@ -1614,6 +1662,7 @@ dev/gpio/gpioc.c optional gpio \
dev/gpio/gpioiic.c optional gpioiic
dev/gpio/gpioled.c optional gpioled !fdt
dev/gpio/gpioled_fdt.c optional gpioled fdt
+dev/gpio/gpiopower.c optional gpiopower fdt
dev/gpio/gpioregulator.c optional gpioregulator fdt ext_resources
dev/gpio/gpiospi.c optional gpiospi
dev/gpio/gpio_if.m optional gpio
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 99d4aef326b1..c6609a31fbf4 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -292,18 +292,20 @@ dev/hwpmc/hwpmc_uncore.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_tsc.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
+dev/hyperv/pcib/vmbus_pcib.c optional hyperv pci
dev/hyperv/netvsc/hn_nvs.c optional hyperv
dev/hyperv/netvsc/hn_rndis.c optional hyperv
dev/hyperv/netvsc/if_hn.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
+dev/hyperv/utilities/hv_snapshot.c optional hyperv
dev/hyperv/utilities/hv_shutdown.c optional hyperv
dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hyperv.c optional hyperv
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
-dev/hyperv/vmbus/vmbus.c optional hyperv
+dev/hyperv/vmbus/vmbus.c optional hyperv pci
dev/hyperv/vmbus/vmbus_br.c optional hyperv
dev/hyperv/vmbus/vmbus_chan.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index ea7b7d4b4431..879515185c71 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -52,7 +52,6 @@ arm/arm/pmu.c standard
arm/broadcom/bcm2835/bcm2835_audio.c optional sound vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc soc_brcm_bcm2837
-arm/broadcom/bcm2835/bcm2835_common.c optional fdt soc_brcm_bcm2837
arm/broadcom/bcm2835/bcm2835_cpufreq.c optional soc_brcm_bcm2837
arm/broadcom/bcm2835/bcm2835_dma.c optional soc_brcm_bcm2837
arm/broadcom/bcm2835/bcm2835_fbd.c optional vt soc_brcm_bcm2837
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 681b81f218be..597376de1a23 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -249,18 +249,20 @@ dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_ppro.c optional hwpmc
dev/hwpmc/hwpmc_tsc.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
+dev/hyperv/pcib/vmbus_pcib.c optional hyperv pci
dev/hyperv/netvsc/hn_nvs.c optional hyperv
dev/hyperv/netvsc/hn_rndis.c optional hyperv
dev/hyperv/netvsc/if_hn.c optional hyperv
dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv
dev/hyperv/utilities/hv_heartbeat.c optional hyperv
dev/hyperv/utilities/hv_kvp.c optional hyperv
+dev/hyperv/utilities/hv_snapshot.c optional hyperv
dev/hyperv/utilities/hv_shutdown.c optional hyperv
dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
dev/hyperv/vmbus/hyperv.c optional hyperv
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
-dev/hyperv/vmbus/vmbus.c optional hyperv
+dev/hyperv/vmbus/vmbus.c optional hyperv pci
dev/hyperv/vmbus/vmbus_br.c optional hyperv
dev/hyperv/vmbus/vmbus_chan.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 0a2d9a65ee76..ee72dbe0ebe1 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -74,7 +74,7 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.
CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
.if ${MACHINE_CPUARCH} == "mips"
-CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000
+CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${MACHINE_ARCH}"'
.endif
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ca2ebc82247b..72e9ae60610a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -39,6 +39,28 @@ fi
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
+#
+# findvcs dir
+# Looks up directory dir at world root and up the filesystem
+#
+findvcs()
+{
+ local savedir
+
+ savedir=$(pwd)
+ cd ${SYSDIR}/..
+ while [ $(pwd) != "/" ]; do
+ if [ -d "./$1" ]; then
+ VCSDIR=$(pwd)"/$1"
+ cd ${savedir}
+ return 0
+ fi
+ cd ..
+ done
+ cd ${savedir}
+ return 1
+}
+
if [ -z "${SYSDIR}" ]; then
SYSDIR=$(dirname $0)/..
fi
@@ -142,19 +164,20 @@ for dir in /usr/bin /usr/local/bin; do
p4_cmd=${dir}/p4
fi
done
-if [ -d "${SYSDIR}/../.git" ] ; then
+
+if findvcs .git; then
for dir in /usr/bin /usr/local/bin; do
if [ -x "${dir}/git" ] ; then
- git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+ git_cmd="${dir}/git --git-dir=${VCSDIR}"
break
fi
done
fi
-if [ -d "${SYSDIR}/../.hg" ] ; then
+if findvcs .hg; then
for dir in /usr/bin /usr/local/bin; do
if [ -x "${dir}/hg" ] ; then
- hg_cmd="${dir}/hg -R ${SYSDIR}/.."
+ hg_cmd="${dir}/hg -R ${VCSDIR}"
break
fi
done
@@ -193,7 +216,7 @@ if [ -n "$git_cmd" ] ; then
if [ -n "$git_b" ] ; then
git="${git}(${git_b})"
fi
- if $git_cmd --work-tree=${SYSDIR}/.. diff-index \
+ if $git_cmd --work-tree=${VCSDIR}/.. diff-index \
--name-only HEAD | read dummy; then
git="${git}-dirty"
fi
diff --git a/sys/conf/options b/sys/conf/options
index 79f71a8e487c..da04567fa48d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -220,6 +220,7 @@ SYSVSHM opt_sysvipc.h
SW_WATCHDOG opt_watchdog.h
TURNSTILE_PROFILING
UMTX_PROFILING
+UMTX_CHAINS opt_global.h
VERBOSE_SYSINIT
# POSIX kernel options
@@ -992,7 +993,11 @@ BHND_LOGLEVEL opt_global.h
# GPIO and child devices
GPIO_SPI_DEBUG opt_gpio.h
+# etherswitch(4) driver
+RTL8366_SOFT_RESET opt_etherswitch.h
+
# evdev protocol support
EVDEV_SUPPORT opt_evdev.h
EVDEV_DEBUG opt_evdev.h
UINPUT_DEBUG opt_evdev.h
+
diff --git a/sys/conf/options.riscv b/sys/conf/options.riscv
index c263bd860875..af6a89e80f19 100644
--- a/sys/conf/options.riscv
+++ b/sys/conf/options.riscv
@@ -1,4 +1,4 @@
# $FreeBSD$
RISCV opt_global.h
-VFP opt_global.h
+FPE opt_global.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 23:06:16 +0000