diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
| commit | 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a (patch) | |
| tree | e1133482f365abf9103e91538cc0e8e29806abe9 /Makefile.target | |
| parent | b4dabf9587d8e1d5d5edc6d3326021e390b9a532 (diff) | |
| parent | 25a118130fde0d20b0f5a223642849b392b2f2ee (diff) | |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.target b/Makefile.target index a53a2ff6ed..c566eb1149 100644 --- a/Makefile.target +++ b/Makefile.target @@ -3,6 +3,7 @@ GENERATED_HEADERS = config-target.h CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) +CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) include ../config-host.mak include config-devices.mak @@ -204,20 +205,9 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) QEMU_CFLAGS += $(VNC_PNG_CFLAGS) -# xen backend driver support -obj-i386-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o - -ifeq ($(TARGET_BASE_ARCH), i386) - CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) -else - CONFIG_NO_XEN = y -endif # xen support -CONFIG_NO_XEN_MAPCACHE = $(if $(subst n,,$(CONFIG_XEN_MAPCACHE)),n,y) -obj-i386-$(CONFIG_XEN) += xen-all.o +obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o obj-$(CONFIG_NO_XEN) += xen-stub.o -obj-i386-$(CONFIG_XEN_MAPCACHE) += xen-mapcache.o -obj-$(CONFIG_NO_XEN_MAPCACHE) += xen-mapcache-stub.o obj-i386-$(CONFIG_XEN) += xen_platform.o |