svn commit: r354204 - head/sys/conf

Warner Losh imp at FreeBSD.org
Wed Oct 30 19:53:48 UTC 2019


Author: imp
Date: Wed Oct 30 19:53:46 2019
New Revision: 354204
URL: https://svnweb.freebsd.org/changeset/base/354204

Log:
  Move all the sys/dev/[a-j]* that are common to files.x86
  
  All these device entries are common between the two files. Move them to
  files.x86. Also sort entries from this range into proper order in files.amd64.

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.x86

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Oct 30 19:53:37 2019	(r354203)
+++ head/sys/conf/files.amd64	Wed Oct 30 19:53:46 2019	(r354204)
@@ -152,33 +152,8 @@ dev/agp/agp_amd64.c		optional	agp
 dev/agp/agp_i810.c		optional	agp
 dev/agp/agp_via.c		optional	agp
 dev/amdgpio/amdgpio.c		optional	amdgpio
-dev/amdsbwd/amdsbwd.c		optional	amdsbwd
-dev/amdsmn/amdsmn.c		optional	amdsmn | amdtemp
-dev/amdtemp/amdtemp.c		optional	amdtemp
-dev/arcmsr/arcmsr.c		optional	arcmsr pci
-dev/asmc/asmc.c			optional	asmc isa
-dev/atkbdc/atkbd.c		optional	atkbd atkbdc
-dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
-dev/atkbdc/atkbdc.c		optional	atkbdc
-dev/atkbdc/atkbdc_isa.c		optional	atkbdc isa
-dev/atkbdc/atkbdc_subr.c	optional	atkbdc
-dev/atkbdc/psm.c		optional	psm atkbdc
-dev/coretemp/coretemp.c		optional	coretemp
-dev/cpuctl/cpuctl.c		optional	cpuctl
-dev/dpms/dpms.c			optional	dpms
-dev/fb/fb.c			optional	fb | vga
-dev/fb/s3_pci.c			optional	s3pci
-dev/fb/vesa.c			optional	vga vesa
-dev/fb/vga.c			optional	vga
-dev/ichwd/ichwd.c		optional	ichwd
-dev/if_ndis/if_ndis.c		optional	ndis
-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/imcsmb/imcsmb.c		optional	imcsmb
-dev/imcsmb/imcsmb_pci.c		optional	imcsmb pci
-dev/intel/spi.c			optional	intelspi
-dev/io/iodev.c			optional	io
+dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
+dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/ioat/ioat.c			optional	ioat pci
 dev/ioat/ioat_test.c		optional	ioat pci
 dev/ixl/if_ixl.c		optional	ixl pci \
@@ -211,10 +186,6 @@ dev/ixl/i40e_adminq.c		optional	ixl pci | iavf pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/gpio/bytgpio.c		optional	bytgpio
-dev/gpio/chvgpio.c		optional	chvgpio
-dev/hyperv/vmbus/amd64/hyperv_machdep.c			optional	hyperv
-dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/nctgpio/nctgpio.c		optional	nctgpio
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional	if_ntb
@@ -225,8 +196,6 @@ dev/ntb/ntb_hw/ntb_hw_amd.c	optional	ntb_hw_amd | ntb_
 dev/ntb/ntb_hw/ntb_hw_intel.c	optional	ntb_hw_intel | ntb_hw
 dev/ntb/ntb_hw/ntb_hw_plx.c	optional	ntb_hw_plx | ntb_hw
 dev/ntb/test/ntb_tool.c		optional	ntb_tool
-dev/vmd/vmd.c			optional	vmd
-dev/vmd/vmd_bus.c		optional	vmd_bus
 dev/nvram/nvram.c		optional	nvram isa
 dev/random/ivy.c		optional	rdrand_rng !random_loadable
 dev/random/nehemiah.c		optional	padlock_rng !random_loadable
@@ -376,6 +345,8 @@ dev/vmware/vmci/vmci_kernel_if.c	optional	vmci
 dev/vmware/vmci/vmci_qpair.c		optional	vmci
 dev/vmware/vmci/vmci_queue_pair.c	optional	vmci
 dev/vmware/vmci/vmci_resource.c		optional	vmci
+dev/vmd/vmd.c			optional	vmd
+dev/vmd/vmd_bus.c		optional	vmd_bus
 dev/wbwd/wbwd.c			optional	wbwd
 dev/xen/pci/xen_acpi_pci.c	optional	xenhvm
 dev/xen/pci/xen_pci.c		optional	xenhvm

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Oct 30 19:53:37 2019	(r354203)
+++ head/sys/conf/files.i386	Wed Oct 30 19:53:46 2019	(r354204)
@@ -100,52 +100,23 @@ dev/agp/agp_intel.c		optional agp
 dev/agp/agp_nvidia.c		optional agp
 dev/agp/agp_sis.c		optional agp
 dev/agp/agp_via.c		optional agp
-dev/amdsbwd/amdsbwd.c		optional amdsbwd
-dev/amdsmn/amdsmn.c		optional amdsmn | amdtemp
-dev/amdtemp/amdtemp.c		optional amdtemp
-dev/arcmsr/arcmsr.c		optional arcmsr pci
-dev/asmc/asmc.c			optional asmc isa
-dev/atkbdc/atkbd.c		optional atkbd atkbdc
-dev/atkbdc/atkbd_atkbdc.c	optional atkbd atkbdc
-dev/atkbdc/atkbdc.c		optional atkbdc
-dev/atkbdc/atkbdc_isa.c		optional atkbdc isa
-dev/atkbdc/atkbdc_subr.c	optional atkbdc
-dev/atkbdc/psm.c		optional psm atkbdc
 dev/ce/ceddk.c			optional ce
 dev/ce/if_ce.c			optional ce
 dev/ce/tau32-ddk.c		optional ce \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
-dev/coretemp/coretemp.c		optional coretemp
 dev/cp/cpddk.c			optional cp
 dev/cp/if_cp.c			optional cp
-dev/cpuctl/cpuctl.c		optional cpuctl
 dev/ctau/ctau.c			optional ctau
 dev/ctau/ctddk.c		optional ctau
 dev/ctau/if_ct.c		optional ctau
 dev/cx/csigma.c			optional cx
 dev/cx/cxddk.c			optional cx
 dev/cx/if_cx.c			optional cx
-dev/dpms/dpms.c			optional dpms
-dev/fb/fb.c			optional fb | vga
-dev/fb/s3_pci.c			optional s3pci
-dev/fb/vesa.c			optional vga vesa
-dev/fb/vga.c			optional vga
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
-dev/gpio/bytgpio.c		optional	bytgpio
-dev/gpio/chvgpio.c		optional	chvgpio
 dev/hyperv/vmbus/i386/hyperv_machdep.c			optional	hyperv
 dev/hyperv/vmbus/i386/vmbus_vector.S			optional	hyperv
-dev/ichwd/ichwd.c		optional ichwd
-dev/if_ndis/if_ndis.c		optional ndis
-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/imcsmb/imcsmb.c		optional imcsmb
-dev/imcsmb/imcsmb_pci.c		optional imcsmb pci
-dev/intel/spi.c			optional intelspi
-dev/io/iodev.c			optional io
 dev/le/if_le_isa.c		optional le isa
 dev/nctgpio/nctgpio.c		optional nctgpio
 dev/nfe/if_nfe.c		optional nfe pci

Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86	Wed Oct 30 19:53:37 2019	(r354203)
+++ head/sys/conf/files.x86	Wed Oct 30 19:53:46 2019	(r354204)
@@ -60,6 +60,17 @@ dev/acpica/acpi_pcib_acpi.c	optional	acpi pci
 dev/acpica/acpi_pcib_pci.c	optional	acpi pci
 dev/acpica/acpi_pxm.c		optional	acpi
 dev/acpica/acpi_timer.c		optional	acpi
+dev/amdsbwd/amdsbwd.c		optional	amdsbwd
+dev/amdsmn/amdsmn.c		optional	amdsmn | amdtemp
+dev/amdtemp/amdtemp.c		optional	amdtemp
+dev/arcmsr/arcmsr.c		optional	arcmsr pci
+dev/asmc/asmc.c			optional	asmc isa
+dev/atkbdc/atkbd.c		optional	atkbd atkbdc
+dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
+dev/atkbdc/atkbdc.c		optional	atkbdc
+dev/atkbdc/atkbdc_isa.c		optional	atkbdc isa
+dev/atkbdc/atkbdc_subr.c	optional	atkbdc
+dev/atkbdc/psm.c		optional	psm atkbdc
 dev/bxe/bxe.c                   optional	bxe pci
 dev/bxe/bxe_stats.c             optional	bxe pci
 dev/bxe/bxe_debug.c             optional	bxe pci
@@ -68,10 +79,19 @@ dev/bxe/bxe_elink.c             optional	bxe pci
 dev/bxe/57710_init_values.c     optional	bxe pci
 dev/bxe/57711_init_values.c     optional	bxe pci
 dev/bxe/57712_init_values.c     optional	bxe pci
+dev/coretemp/coretemp.c		optional	coretemp
+dev/cpuctl/cpuctl.c		optional	cpuctl
+dev/dpms/dpms.c			optional	dpms
+dev/fb/fb.c			optional	fb | vga
+dev/fb/s3_pci.c			optional	s3pci
+dev/fb/vesa.c			optional	vga vesa
+dev/fb/vga.c			optional	vga
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
+dev/gpio/bytgpio.c		optional	bytgpio
+dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
 dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx
@@ -130,6 +150,15 @@ dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_if.m				optional	hyperv
 dev/hyperv/vmbus/vmbus_res.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_xact.c				optional	hyperv
+dev/ichwd/ichwd.c		optional	ichwd
+dev/if_ndis/if_ndis.c		optional	ndis
+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/imcsmb/imcsmb.c		optional	imcsmb
+dev/imcsmb/imcsmb_pci.c		optional	imcsmb pci
+dev/intel/spi.c			optional	intelspi
+dev/io/iodev.c			optional	io
 dev/ipmi/ipmi.c			optional	ipmi
 dev/ipmi/ipmi_acpi.c		optional	ipmi acpi
 dev/ipmi/ipmi_isa.c		optional	ipmi isa


More information about the svn-src-all mailing list