LINARO: [Config] Temporarily drop enforcement of CONFIG_PM_DEBUG for s5pv310

CONFIG_PM is currently broken so we can't enable CONFIG_PM_DEBUG

Signed-off-by: John Rigby <john.rigby@linaro.org>

7 files changed, 13 insertions, 8 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index e495ece395f6..ba6e56fe5249 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -149,6 +149,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FONTS is not set
+CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -365,6 +366,7 @@ CONFIG_NO_HZ=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+CONFIG_PM=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
 # CONFIG_PREEMPT_NONE is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index eaa1ff5ffced..8c712147a3f8 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -164,6 +164,7 @@ CONFIG_FB_SM7XX=m
 # CONFIG_FIXED_PHY is not set
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
+CONFIG_FREEZER=y
 CONFIG_FSCACHE=m
 CONFIG_FTL=m
 CONFIG_FTRACE=y
@@ -397,6 +398,7 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_PHONE=m
 CONFIG_PHONET=m
 CONFIG_PID_NS=y
+CONFIG_PM=y
 CONFIG_POHMELFS=m
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 5358a4241358..047b41aa8b79 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -152,6 +152,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FONTS is not set
+# CONFIG_FREEZER is not set
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 CONFIG_FTRACE=y
@@ -370,6 +371,7 @@ CONFIG_NR_CPUS=2
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+# CONFIG_PM is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
 # CONFIG_PREEMPT_NONE is not set
@@ -545,7 +547,6 @@ CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_OTG is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 585be3f7ce4d..87f5709e1527 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -158,6 +158,7 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_SM7XX is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_FONTS is not set
+CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -380,6 +381,7 @@ CONFIG_NR_CPUS=2
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+CONFIG_PM=y
 # CONFIG_POHMELFS is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 53f61a71a97c..9571326216d4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -155,6 +155,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FIXED_PHY is not set
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
+CONFIG_FREEZER=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -378,6 +379,7 @@ CONFIG_OABI_COMPAT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
+CONFIG_PM=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
 CONFIG_PREEMPT_NONE=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 3751ab64a84a..04312f75162d 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -748,7 +748,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
-CONFIG_FREEZER=y
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_FSCACHE_HISTOGRAM=y
 # CONFIG_FSCACHE_OBJECT_LIST is not set
@@ -1901,7 +1900,6 @@ CONFIG_PLAT_SAMSUNG=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
-CONFIG_PM=y
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
@@ -2105,10 +2103,6 @@ CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_SAMSUNG_GPIO_EXTRA=0
 CONFIG_SAMSUNG_IRQ_UART=y
 CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
-CONFIG_SAMSUNG_PD=y
-CONFIG_SAMSUNG_PM_CHECK=y
-CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE=64
-CONFIG_SAMSUNG_PM_DEBUG=y
 CONFIG_SATA_MV=m
 CONFIG_SCA3000=m
 # CONFIG_SCHED_AUTOGROUP is not set
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index c7c4562ba35b..cc1b5b12770d 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -75,4 +75,6 @@ value CONFIG_IMA n
 value CONFIG_IPV6 y
 
 value CONFIG_PRINTK_TIME y
-value CONFIG_PM_DEBUG y
+
+# CONFIG_PM is broken on s5pv310 so don't enforce CONFIG_PM_DEBUG for the moment
+value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_DEBUG y