[PATCH 1/8] UBUNTU: [Config] FTBFS arm[hf|el]/omap: disable XEN

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 +
 debian.master/config/armel/config.common.armel     |    3 ++-
 debian.master/config/armhf/config.common.armhf     |    1 -
 debian.master/config/armhf/config.flavour.highbank |    2 ++
 debian.master/config/armhf/config.flavour.omap     |    2 ++
 debian.master/config/config.common.ubuntu          |    1 -
 debian.master/config/i386/config.common.i386       |    1 +
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 815a968..c012188 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -265,6 +265,7 @@ CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_XEN=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XFS_RT=y
 CONFIG_ZLIB_DEFLATE=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 01a8f32..00ecae6 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -226,7 +226,7 @@ CONFIG_SUN_PARTITION=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSV68_PARTITION=y
-CONFIG_SYS_HYPERVISOR=y
+# CONFIG_SYS_HYPERVISOR is not set
 CONFIG_TCG_TPM=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
@@ -266,6 +266,7 @@ CONFIG_WAN=y
 CONFIG_WATCHDOG=y
 # CONFIG_WIMAX_I2400M_USB is not set
 # CONFIG_WM8350_WATCHDOG is not set
+# CONFIG_XEN is not set
 CONFIG_XFS_RT=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index f6d9d2e..5cdfb01 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -79,7 +79,6 @@ CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y
 # CONFIG_STMMAC_ETH is not set
-CONFIG_SYS_HYPERVISOR=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index bc80616..01e2a5f 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -148,6 +148,7 @@ CONFIG_SPI_PL022=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_SYSCTL_SYSCALL is not set
 # CONFIG_SYSV68_PARTITION is not set
+CONFIG_SYS_HYPERVISOR=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEST_KSTRTOX is not set
@@ -167,4 +168,5 @@ CONFIG_VERSION_SIGNATURE="Ubuntu 3.2.0-1800.1-highbank 3.2.9"
 # CONFIG_WAN is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_WIMAX_I2400M_USB=m
+CONFIG_XEN=y
 # CONFIG_XFS_RT is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 6250960..493d09b 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -148,6 +148,7 @@ CONFIG_SUN_PARTITION=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSV68_PARTITION=y
+# CONFIG_SYS_HYPERVISOR is not set
 CONFIG_TCG_TPM=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
@@ -167,4 +168,5 @@ CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_WAN=y
 CONFIG_WATCHDOG=y
 # CONFIG_WIMAX_I2400M_USB is not set
+# CONFIG_XEN is not set
 CONFIG_XFS_RT=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a4eb86b..b97779e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6640,7 +6640,6 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_X32 is not set
 CONFIG_X86_XADD=y
-CONFIG_XEN=y
 CONFIG_XENFS=m
 CONFIG_XEN_ACPI_PROCESSOR=y
 CONFIG_XEN_BACKEND=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 09f4ba82..ecea18c 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -264,6 +264,7 @@ CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_SPEEDSTEP_LIB=y
+CONFIG_XEN=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 CONFIG_XFS_RT=y
 CONFIG_ZLIB_DEFLATE=m
-- 
1.7.10.4