[PATCH 1/3] UBUNTU: [Config] armhf: generic: disable CPU_IDLE

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 +
 debian.master/config/armhf/config.flavour.generic  |    2 +-
 .../config/armhf/config.flavour.generic-lpae       |    2 +-
 debian.master/config/config.common.ubuntu          |    2 +-
 debian.master/config/enforce                       |    4 ++++
 debian.master/config/i386/config.common.i386       |    1 +
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64el/config.common.ppc64el |    1 +
 8 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ab15794..cc8b69f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -49,6 +49,7 @@ CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC8=m
 CONFIG_DDR=y
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 8139212..8752994 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -11,9 +11,9 @@ CONFIG_ARCH_OMAP4=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_COMPACTION is not set
+# CONFIG_CPU_IDLE is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_DDC=m
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 0d3ffc50..c6e50a0 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -11,9 +11,9 @@ CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARM_ATAG_DTB_COMPAT is not set
-CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_LPAE=y
 CONFIG_COMPACTION=y
+CONFIG_CPU_IDLE=y
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_DDC is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7912a6e..8f5d39d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -396,6 +396,7 @@ CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
@@ -1208,7 +1209,6 @@ CONFIG_CPU_FREQ_PMAC64=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 7c578fe..43cde6d 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -124,3 +124,7 @@ value CONFIG_I2C_DESIGNWARE_PLATFORM m | \
 
 # Required if /init is a shell script.
 value CONFIG_BINFMT_SCRIPT y
+
+# CPUIDLE is a source of instabilities on ECX-1000, leave it off
+((flavour generic & arch armhf &/ value CONFIG_CPU_IDLE n) | \
+	!exists MISSING)
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 53aecb1..d89da27 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -48,6 +48,7 @@ CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC8=m
 CONFIG_DDR=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index f416e61..bb8fc31 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -47,6 +47,7 @@ CONFIG_CORDIC=m
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_IDLE=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRC8=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 77f16f2..44c5b8e 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -43,6 +43,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_IDLE=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRC8 is not set
-- 
1.7.9.5