From e609c3d1a1ef3699fcbdffe70a23ad316fbfe7d7 Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 14 Aug 2019 20:58:28 +0000 Subject: [PATCH] Move hyperv to files.x86 Move the comomon part of hyperv to files.x86. Reviewed by: jhb (verbal OK on irc) Differential Revision: https://reviews.freebsd.org/D21248 --- sys/conf/files.amd64 | 22 ---------------------- sys/conf/files.i386 | 20 -------------------- sys/conf/files.x86 | 24 ++++++++++++++++++++---- 3 files changed, 20 insertions(+), 46 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index b3b80a23384e..94cc3073f7cf 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -230,28 +230,6 @@ dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_uncore.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc -dev/hyperv/input/hv_kbd.c optional hyperv -dev/hyperv/input/hv_kbdc.c optional hyperv -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_kvp.c optional hyperv -dev/hyperv/utilities/hv_snapshot.c optional hyperv -dev/hyperv/utilities/vmbus_heartbeat.c optional hyperv -dev/hyperv/utilities/vmbus_ic.c optional hyperv -dev/hyperv/utilities/vmbus_shutdown.c optional hyperv -dev/hyperv/utilities/vmbus_timesync.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 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 -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/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv dev/nctgpio/nctgpio.c optional nctgpio diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 78db448f8bc6..e1ab4a4ad03d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -148,26 +148,6 @@ dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_uncore.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_kvp.c optional hyperv -dev/hyperv/utilities/hv_snapshot.c optional hyperv -dev/hyperv/utilities/vmbus_heartbeat.c optional hyperv -dev/hyperv/utilities/vmbus_ic.c optional hyperv -dev/hyperv/utilities/vmbus_shutdown.c optional hyperv -dev/hyperv/utilities/vmbus_timesync.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 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 -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/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv dev/hyperv/vmbus/i386/vmbus_vector.S optional hyperv dev/ichwd/ichwd.c optional ichwd diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index fd8262b4272b..d0aadefa0362 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -70,10 +70,6 @@ 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/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/hpt27xx/hpt27xx_os_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx @@ -104,6 +100,26 @@ hptrr_lib.o optional hptrr \ dependency "$S/dev/hptrr/$M-elf.hptrr_lib.o.uu" \ compile-with "uudecode < $S/dev/hptrr/$M-elf.hptrr_lib.o.uu" \ no-implicit-rule +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_kvp.c optional hyperv +dev/hyperv/utilities/hv_snapshot.c optional hyperv +dev/hyperv/utilities/vmbus_heartbeat.c optional hyperv +dev/hyperv/utilities/vmbus_ic.c optional hyperv +dev/hyperv/utilities/vmbus_shutdown.c optional hyperv +dev/hyperv/utilities/vmbus_timesync.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 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 +dev/hyperv/vmbus/vmbus_if.m optional hyperv +dev/hyperv/vmbus/vmbus_res.c optional hyperv +dev/hyperv/vmbus/vmbus_xact.c optional hyperv libkern/x86/crc32_sse42.c standard # # x86 shared code between IA32 and AMD64 architectures