diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-08-06 11:32:34 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-21 10:41:00 +0100 |
| commit | d7f056a32e0906c2ef43e23801c621ec897a238c (patch) | |
| tree | 10ef29df52c049d580d82dc498537f405f4ec6bb | |
| parent | 5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3 (diff) | |
| download | xen-d7f056a32e0906c2ef43e23801c621ec897a238c.tar.gz xen-d7f056a32e0906c2ef43e23801c621ec897a238c.tar.bz2 xen-d7f056a32e0906c2ef43e23801c621ec897a238c.zip | |
build: CONFIG_IOEMU is now obsolete
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | config/x86_32.mk | 1 | ||||
| -rw-r--r-- | config/x86_64.mk | 1 |
3 files changed, 2 insertions, 8 deletions
@@ -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 df52bd6d3e..7f76b256a3 100644 --- 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 d925b23770..11104bdc05 100644 --- 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 |