git: b9c6fa339d9c - main - files.x86: Pull in some more duplicate lines from files.{amd64,i386}
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 12 Apr 2024 21:36:26 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=b9c6fa339d9c7c90a1c0f9ebc000ecbde8873508
commit b9c6fa339d9c7c90a1c0f9ebc000ecbde8873508
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-12 21:35:45 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-04-12 21:35:45 +0000
files.x86: Pull in some more duplicate lines from files.{amd64,i386}
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D44759
---
sys/conf/files.amd64 | 32 +-------------------------------
sys/conf/files.i386 | 32 --------------------------------
sys/conf/files.x86 | 32 ++++++++++++++++++++++++++++++++
3 files changed, 33 insertions(+), 63 deletions(-)
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 09478599efc5..6322837c887b 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -109,10 +109,6 @@ crypto/openssl/amd64/sha1-x86_64.S optional ossl
crypto/openssl/amd64/sha256-x86_64.S optional ossl
crypto/openssl/amd64/sha512-x86_64.S optional ossl
crypto/openssl/amd64/ossl_aes_gcm.c optional ossl
-dev/acpi_support/acpi_wmi_if.m standard
-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/axgbe/if_axgbe_pci.c optional axp
dev/axgbe/xgbe-desc.c optional axp
@@ -239,20 +235,7 @@ dev/ixl/i40e_adminq.c optional ixl 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/nctgpio/nctgpio.c optional nctgpio
dev/ncthwm/ncthwm.c optional ncthwm superio
-dev/nfe/if_nfe.c optional nfe pci
-dev/ntb/if_ntb/if_ntb.c optional if_ntb
-dev/ntb/ntb_transport.c optional ntb_transport | if_ntb
-dev/ntb/ntb.c optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
-dev/ntb/ntb_if.m optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
-dev/ntb/ntb_hw/ntb_hw_amd.c optional ntb_hw_amd | ntb_hw
-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/nvram/nvram.c optional nvram isa
-dev/random/ivy.c optional rdrand_rng !random_loadable
-dev/random/nehemiah.c optional padlock_rng !random_loadable
dev/qlxge/qls_dbg.c optional qlxge pci
dev/qlxge/qls_dump.c optional qlxge pci
dev/qlxge/qls_hw.c optional qlxge pci
@@ -387,29 +370,16 @@ dev/smartpqi/smartpqi_request.c optional smartpqi
dev/smartpqi/smartpqi_response.c optional smartpqi
dev/smartpqi/smartpqi_sis.c optional smartpqi
dev/smartpqi/smartpqi_tag.c optional smartpqi
-dev/speaker/spkr.c optional speaker
dev/sume/if_sume.c optional sume
-dev/superio/superio.c optional superio isa
dev/syscons/apm/apm_saver.c optional apm_saver apm
-dev/syscons/scvesactl.c optional sc vga vesa
-dev/syscons/scvgarndr.c optional sc vga
-dev/tpm/tpm.c optional tpm
-dev/tpm/tpm20.c optional tpm
+dev/tpm/tpm20.c optional tpm
dev/tpm/tpm_crb.c optional tpm acpi
dev/tpm/tpm_tis.c optional tpm acpi
dev/tpm/tpm_acpi.c optional tpm acpi
dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_x86.c optional uart
-dev/viawd/viawd.c optional viawd
-dev/vmd/vmd.c optional vmd | vmd_bus
-dev/wbwd/wbwd.c optional wbwd
-dev/wdatwd/wdatwd.c optional wdatwd
dev/p2sb/p2sb.c optional p2sb pci
dev/p2sb/lewisburg_gpiocm.c optional lbggpiocm p2sb
dev/p2sb/lewisburg_gpio.c optional lbggpio lbggpiocm
-isa/syscons_isa.c optional sc
-isa/vga_isa.c optional vga
-kern/imgact_aout.c optional compat_aout
kern/link_elf_obj.c standard
#
# IA32 binary support
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index a55d5302b3e1..41c51a7aa9c5 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -22,49 +22,20 @@ crypto/openssl/i386/sha256-586.S optional ossl
crypto/openssl/i386/sha512-586.S optional ossl
dev/agp/agp_ali.c optional agp
dev/agp/agp_amd.c optional agp
-dev/agp/agp_amd64.c optional agp
dev/agp/agp_ati.c optional agp
-dev/agp/agp_i810.c optional agp
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/glxiic/glxiic.c optional glxiic
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv
dev/le/if_le_isa.c optional le isa
-dev/nctgpio/nctgpio.c optional nctgpio
-dev/nfe/if_nfe.c optional nfe pci
-dev/ntb/if_ntb/if_ntb.c optional if_ntb
-dev/ntb/ntb_transport.c optional ntb_transport | if_ntb
-dev/ntb/ntb.c optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
-dev/ntb/ntb_if.m optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
-dev/ntb/ntb_hw/ntb_hw_amd.c optional ntb_hw_amd | ntb_hw
-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/nvram/nvram.c optional nvram isa
dev/ofw/ofw_pcib.c optional fdt pci
dev/pcf/pcf_isa.c optional pcf
-dev/random/ivy.c optional rdrand_rng !random_loadable
-dev/random/nehemiah.c optional padlock_rng !random_loadable
dev/sbni/if_sbni.c optional sbni
dev/sbni/if_sbni_isa.c optional sbni isa
dev/sbni/if_sbni_pci.c optional sbni pci
-dev/speaker/spkr.c optional speaker
-dev/superio/superio.c optional superio isa
-dev/syscons/scvesactl.c optional sc vga vesa
-dev/syscons/scvgarndr.c optional sc vga
-dev/tpm/tpm.c optional tpm
-dev/tpm/tpm_acpi.c optional tpm acpi
-dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_x86.c optional uart
-dev/viawd/viawd.c optional viawd
-dev/vmd/vmd.c optional vmd
-dev/acpi_support/acpi_wmi_if.m standard
-dev/wbwd/wbwd.c optional wbwd
-dev/wdatwd/wdatwd.c optional wdatwd
i386/acpica/acpi_machdep.c optional acpi
i386/acpica/acpi_wakeup.c optional acpi
acpi_wakecode.o optional acpi \
@@ -134,9 +105,6 @@ i386/i386/vm86.c standard
i386/i386/vm_machdep.c standard
i386/pci/pci_cfgreg.c optional pci
i386/pci/pci_pir.c optional pci
-isa/syscons_isa.c optional sc
-isa/vga_isa.c optional vga
-kern/imgact_aout.c optional compat_aout
kern/subr_sfbuf.c standard
libkern/divdi3.c standard
libkern/divmoddi4.c standard
diff --git a/sys/conf/files.x86 b/sys/conf/files.x86
index 8bd58ab4d339..ce31c42215be 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -58,6 +58,10 @@ 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
+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
@@ -292,14 +296,42 @@ dev/mana/mana_sysctl.c optional mana
dev/mana/shm_channel.c optional mana
dev/mana/hw_channel.c optional mana
dev/mana/gdma_util.c optional mana
+dev/nctgpio/nctgpio.c optional nctgpio
+dev/nfe/if_nfe.c optional nfe pci
+dev/ntb/if_ntb/if_ntb.c optional if_ntb
+dev/ntb/ntb_transport.c optional ntb_transport | if_ntb
+dev/ntb/ntb.c optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
+dev/ntb/ntb_if.m optional ntb | ntb_transport | if_ntb | ntb_hw_amd | ntb_hw_intel | ntb_hw_plx | ntb_hw
+dev/ntb/ntb_hw/ntb_hw_amd.c optional ntb_hw_amd | ntb_hw
+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/nvram/nvram.c optional nvram isa
+dev/random/ivy.c optional rdrand_rng !random_loadable
+dev/random/nehemiah.c optional padlock_rng !random_loadable
dev/qat_c2xxx/qat.c optional qat_c2xxx
dev/qat_c2xxx/qat_ae.c optional qat_c2xxx
dev/qat_c2xxx/qat_c2xxx.c optional qat_c2xxx
dev/qat_c2xxx/qat_hw15.c optional qat_c2xxx
dev/smbios/smbios_subr.c standard
+dev/speaker/spkr.c optional speaker
+dev/superio/superio.c optional superio isa
+dev/syscons/scvesactl.c optional sc vga vesa
+dev/syscons/scvgarndr.c optional sc vga
+dev/tpm/tpm.c optional tpm
+dev/tpm/tpm_acpi.c optional tpm acpi
+dev/tpm/tpm_isa.c optional tpm isa
+dev/uart/uart_cpu_x86.c optional uart
+dev/viawd/viawd.c optional viawd
+dev/vmd/vmd.c optional vmd | vmd_bus
+dev/wbwd/wbwd.c optional wbwd
+dev/wdatwd/wdatwd.c optional wdatwd
+isa/syscons_isa.c optional sc
+isa/vga_isa.c optional vga
libkern/strcmp.c standard
libkern/strncmp.c standard
libkern/x86/crc32_sse42.c standard
+kern/imgact_aout.c optional compat_aout
#
# x86 shared code between IA32 and AMD64 architectures
#