[build] Include Xen and Hyper-V drivers only in x86 BIOS and UEFI builds

The Xen and Hyper-V drivers cannot be included in the Linux userspace
build since they require MMIO accesses.  Limit these drivers to being
included in the all-drivers build only for BIOS and UEFI platforms.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index b84ee830c2c75a01c40ee8a0f0947ab409ecbe23..1a1f2dacdabe3ba7388aebcdf46b165e34c3f73d 100644 (file)
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -28,11 +28,3 @@ CFLAGS               += -DNVALGRIND
 # Define version string for lkrnprefix.S
 #
 CFLAGS_lkrnprefix      += -DVERSION="\"$(VERSION)\""
-
-# Include Xen driver in the all-drivers build
-#
-DRIVERS_ipxe           += $(DRIVERS_xenbus_net)
-
-# Include Hyper-V driver in the all-drivers build
-#
-DRIVERS_ipxe           += $(DRIVERS_vmbus_net)

diff --git a/src/arch/x86/Makefile.efi b/src/arch/x86/Makefile.efi
index f04be425b8b650ef5207f344ceadc3748949a5c9..8c2c1caf8689eb15c8daeb4e2d1c1bc60bd8fdb9 100644 (file)
--- a/src/arch/x86/Makefile.efi
+++ b/src/arch/x86/Makefile.efi
@@ -4,3 +4,8 @@
 #
 MAKEDEPS       += Makefile.efi
 include Makefile.efi
+
+# Include Xen and Hyper-V drivers in the all-drivers build
+#
+DRIVERS_ipxe   += $(DRIVERS_xenbus_net)
+DRIVERS_ipxe   += $(DRIVERS_vmbus_net)

diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
index 38dfa087ce348349f3421b254440b2c14afbba80..d02e6251230275357796bd1fbd20231209f71e69 100644 (file)
--- a/src/arch/x86/Makefile.pcbios
+++ b/src/arch/x86/Makefile.pcbios
@@ -105,3 +105,8 @@ NON_AUTO_MEDIA += pdsk
 %pdsk : %dsk
        $(Q)cp $< $@
        $(Q)$(PADIMG) --blksize=1474560 $@
+
+# Include Xen and Hyper-V drivers in the all-drivers build
+#
+DRIVERS_ipxe   += $(DRIVERS_xenbus_net)
+DRIVERS_ipxe   += $(DRIVERS_vmbus_net)