[PATCH 3/5] UBUNTU: [Config] armhf: build in pstore-ram

[Andy Whitcroft]

On Wed, Nov 06, 2013 at 03:34:45PM +0100, Paolo Pisati wrote:
> From: Rob Herring <rob.herring at calxeda.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1248492
> 
> Build in pstore-ram and enable console support.
> 
> Signed-off-by: Rob Herring <rob.herring at calxeda.com>
> (cherry picked from commit 8daabcd640037a09f5f32b2d4203001866c4a983)

I doubt this is a cherry pick, at least not one we care to have the sha1
for in the logs.

> Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
> ---
>  debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules | 2 --
>  debian.master/abi/3.11.0-12.19/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-12.19/armhf/generic-lpae.modules b/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules
> index 3002bcc..373f757 100644
> --- a/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules
> +++ b/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules
> @@ -1805,7 +1805,6 @@ raid456
>  raid6_pq
>  raid6test
>  raid_class
> -ramoops
>  raw
>  rbd
>  rbtree_test
> @@ -1918,7 +1917,6 @@ rds
>  rds_tcp
>  redboot
>  redrat3
> -reed_solomon
>  reiserfs
>  remoteproc
>  renesas_usbhs
> diff --git a/debian.master/abi/3.11.0-12.19/armhf/generic.modules b/debian.master/abi/3.11.0-12.19/armhf/generic.modules
> index b4fa172..ef1b2ae 100644
> --- a/debian.master/abi/3.11.0-12.19/armhf/generic.modules
> +++ b/debian.master/abi/3.11.0-12.19/armhf/generic.modules
> @@ -2327,7 +2327,6 @@ raid456
>  raid6_pq
>  raid6test
>  raid_class
> -ramoops
>  raw
>  rbd
>  rbtree_test
> @@ -2444,7 +2443,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

Looks ok.

-apw