aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAndrew Cooper <andrew.cooper3@citrix.com>2012-08-01 12:46:51 +0100
committerAndrew Cooper <andrew.cooper3@citrix.com>2012-08-01 12:46:51 +0100
commitf47d809c449a105b77fbc5fc6f058b24f8537a94 (patch)
tree2c3e96900da99ce5e8c6cb4b6a071c49ae68b81c /config
parent0bd69acf0481e0c7997b0e916345ad53a1be0e42 (diff)
downloadxen-f47d809c449a105b77fbc5fc6f058b24f8537a94.tar.gz
xen-f47d809c449a105b77fbc5fc6f058b24f8537a94.tar.bz2
xen-f47d809c449a105b77fbc5fc6f058b24f8537a94.zip
tools/config: Allow building of components to be controlled from .config
For build systems which build certain Xen components separately, allow certain components to be conditionally built based on .config, rather than always building them. This patch allows qemu and blktap to be configured in this manner. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'config')
-rw-r--r--config/x86_32.mk2
-rw-r--r--config/x86_64.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/x86_32.mk b/config/x86_32.mk
index 1f5cd6097d..df52bd6d3e 100644
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -5,7 +5,7 @@ CONFIG_X86_$(XEN_OS) := y
CONFIG_HVM := y
CONFIG_MIGRATE := y
CONFIG_XCUTILS := y
-CONFIG_IOEMU := y
+CONFIG_IOEMU ?= y
CFLAGS += -m32 -march=i686
diff --git a/config/x86_64.mk b/config/x86_64.mk
index 7bead5c455..4ec6cc196b 100644
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -6,7 +6,7 @@ CONFIG_COMPAT := y
CONFIG_HVM := y
CONFIG_MIGRATE := y
CONFIG_XCUTILS := y
-CONFIG_IOEMU := y
+CONFIG_IOEMU ?= y
CFLAGS += -m64