svn commit: r351047 - head/sys/conf

[Warner Losh]

Author: imp
Date: Wed Aug 14 20:58:17 2019
New Revision: 351047
URL: https://svnweb.freebsd.org/changeset/base/351047

Log:
  The ACPI parts are identical between i386 and amd64
  
  Apart from one MD file, ACPI is a x86 implementation, not specific to either
  i386 or amd64, so put it into files.x86. Other architectures include fewer
  files for the same options, so it can't move into the MI files file.
  
  Reviewed by: jhb (verbal OK on irc)
  Differential Revision: https://reviews.freebsd.org/D21248

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 Aug 14 20:58:12 2019	(r351046)
+++ head/sys/conf/files.amd64	Wed Aug 14 20:58:17 2019	(r351047)
@@ -148,15 +148,6 @@ crypto/aesni/aeskeys_amd64.S	optional aesni
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec | ipsec_support
 crypto/des/des_enc.c		optional	crypto | ipsec | \
 	ipsec_support | netsmb
-dev/acpica/acpi_if.m		standard
-dev/acpica/acpi_hpet.c		optional acpi
-dev/acpica/acpi_pci.c		optional acpi pci
-dev/acpica/acpi_pci_link.c	optional acpi pci
-dev/acpica/acpi_pcib.c		optional acpi pci
-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/acpi_support/acpi_wmi_if.m	standard
 dev/agp/agp_amd64.c		optional	agp
 dev/agp/agp_i810.c		optional	agp

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Aug 14 20:58:12 2019	(r351046)
+++ head/sys/conf/files.i386	Wed Aug 14 20:58:17 2019	(r351047)
@@ -98,11 +98,6 @@ bf_enc.o			optional crypto | ipsec	| ipsec_support \
 	no-implicit-rule
 crypto/aesni/aeskeys_i386.S	optional aesni
 crypto/des/arch/i386/des_enc.S	optional crypto | ipsec | ipsec_support | netsmb
-dev/acpica/acpi_pci.c		optional acpi pci
-dev/acpica/acpi_pci_link.c	optional acpi pci
-dev/acpica/acpi_pcib.c		optional acpi pci
-dev/acpica/acpi_pcib_acpi.c	optional acpi pci
-dev/acpica/acpi_pcib_pci.c	optional acpi pci
 dev/agp/agp_ali.c		optional agp
 dev/agp/agp_amd.c		optional agp
 dev/agp/agp_amd64.c		optional agp
@@ -246,10 +241,6 @@ 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/acpica/acpi_if.m		standard
-dev/acpica/acpi_hpet.c		optional acpi
-dev/acpica/acpi_timer.c		optional acpi
-dev/acpica/acpi_pxm.c		optional acpi
 dev/acpi_support/acpi_wmi_if.m	standard
 dev/wbwd/wbwd.c			optional wbwd
 dev/isci/isci.c							optional isci

Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86	Wed Aug 14 20:58:12 2019	(r351046)
+++ head/sys/conf/files.x86	Wed Aug 14 20:58:17 2019	(r351047)
@@ -49,6 +49,15 @@ intel_sha256.o			optional	aesni			\
 crypto/via/padlock.c		optional padlock
 crypto/via/padlock_cipher.c	optional padlock
 crypto/via/padlock_hash.c	optional padlock
+dev/acpica/acpi_hpet.c		optional	acpi
+dev/acpica/acpi_if.m		standard
+dev/acpica/acpi_pci.c		optional	acpi pci
+dev/acpica/acpi_pci_link.c	optional	acpi pci
+dev/acpica/acpi_pcib.c		optional	acpi pci
+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/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa