[PATCH v2] UBUNTU: [Config] armhf: PSTORE_RAM=y and PSTORE_CONSOLE=y

[Paolo Pisati]

From: Rob Herring <rob.herring at calxeda.com>

BugLink: http://bugs.launchpad.net/bugs/1248492

Build in pstore-ram and enable console support: REED_SOLOMON is compiled in
as a dependency.

Signed-off-by: Rob Herring <rob.herring at calxeda.com>
(cherry picked from commit 8daabcd640037a09f5f32b2d4203001866c4a983)
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/abi/3.11.0-13.20/armhf/generic-lpae.modules | 2 --
 debian.master/abi/3.11.0-13.20/armhf/generic.modules      | 2 --
 debian.master/config/amd64/config.common.amd64            | 3 +++
 debian.master/config/armhf/config.common.armhf            | 3 +++
 debian.master/config/config.common.ubuntu                 | 3 ---
 debian.master/config/i386/config.common.i386              | 3 +++
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian.master/abi/3.11.0-13.20/armhf/generic-lpae.modules b/debian.master/abi/3.11.0-13.20/armhf/generic-lpae.modules
index c2b4eab..66afe9e 100644
--- a/debian.master/abi/3.11.0-13.20/armhf/generic-lpae.modules
+++ b/debian.master/abi/3.11.0-13.20/armhf/generic-lpae.modules
@@ -1806,7 +1806,6 @@ raid456
 raid6_pq
 raid6test
 raid_class
-ramoops
 raw
 rbd
 rbtree_test
@@ -1919,7 +1918,6 @@ rds
 rds_tcp
 redboot
 redrat3
-reed_solomon
 reiserfs
 remoteproc
 renesas_usbhs
diff --git a/debian.master/abi/3.11.0-13.20/armhf/generic.modules b/debian.master/abi/3.11.0-13.20/armhf/generic.modules
index 6cc4ba3..d9b493b 100644
--- a/debian.master/abi/3.11.0-13.20/armhf/generic.modules
+++ b/debian.master/abi/3.11.0-13.20/armhf/generic.modules
@@ -2328,7 +2328,6 @@ raid456
 raid6_pq
 raid6test
 raid_class
-ramoops
 raw
 rbd
 rbtree_test
@@ -2445,7 +2444,6 @@ rds_rdma
 rds_tcp
 redboot
 redrat3
-reed_solomon
 reiserfs
 remoteproc
 renesas_usbhs
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 77bf324..d15f532 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -63,10 +63,13 @@ CONFIG_PCCARD=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PPS=m
+# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_RCU_FANOUT=64
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_USER_QS=y
+CONFIG_REED_SOLOMON=m
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b9bc1ca..8986587 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -42,10 +42,13 @@ CONFIG_OMAP_CONTROL_USB=y
 # CONFIG_PCCARD is not set
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PPS=y
+CONFIG_PSTORE_CONSOLE=y
+CONFIG_PSTORE_RAM=y
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_NOCB_CPU is not set
 # CONFIG_RCU_USER_QS is not set
+CONFIG_REED_SOLOMON=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_RT2800USB_UNKNOWN is not set
 CONFIG_RT2X00_LIB_DEBUGFS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d6ae2f7..d43ad72 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4607,9 +4607,7 @@ CONFIG_PROFILING=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PUBLIC_KEY_ALGO_RSA=y
 CONFIG_PVPANIC=m
@@ -4713,7 +4711,6 @@ CONFIG_RD_XZ=y
 # CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
-CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index bd7149d..6433fa6 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -62,9 +62,12 @@ CONFIG_PCCARD=m
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PPS=m
+# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_RAM=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_NOCB_CPU is not set
+CONFIG_REED_SOLOMON=m
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
-- 
1.8.3.2