build: CONFIG_IOEMU is now obsolete

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 2b915374a8a2884bcc106a7d1253c9121ceb4c03..d915660fac20fc7f9ffd1993c9c26fc11e65e005 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,10 +69,6 @@ prep-kernels:
 install-xen:
        $(MAKE) -C xen install
 
-.PHONY: install-tools
-install-tools:
-       $(MAKE) -C tools install
-
 ifeq ($(CONFIG_QEMU_TRAD),y)
 QEMU_TRAD_DIR_TGT := tools/qemu-xen-traditional-dir
 
@@ -95,9 +91,9 @@ tools/qemu-xen-dir-force-update:
        $(MAKE) -C tools qemu-xen-dir-force-update
 endif
 
-ifeq ($(CONFIG_IOEMU),y)
+.PHONY: install-tools
 install-tools: $(QEMU_TRAD_DIR_TARGET) $(QEMU_XEN_DIR_TARGET)
-endif
+       $(MAKE) -C tools install
 
 .PHONY: install-kernels
 install-kernels:

diff --git a/config/x86_32.mk b/config/x86_32.mk
index df52bd6d3e9c9c1d6c68e7d1e4ffcf56ed2b4b9d..7f76b256a3cb70eacc5453cfbd07970a8b31c8df 100644 (file)
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
-CONFIG_IOEMU ?= y
 
 CFLAGS += -m32 -march=i686
 

diff --git a/config/x86_64.mk b/config/x86_64.mk
index d925b2377070c1edb88992e654855bf5e5622d52..11104bdc055d50f530321660656faf1b019c7dfb 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -6,7 +6,6 @@ CONFIG_COMPAT := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
-CONFIG_IOEMU ?= y
 
 CONFIG_XEN_INSTALL_SUFFIX := .gz