From patchwork Wed Nov 6 14:34:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 288928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 8497A2C008E for ; Thu, 7 Nov 2013 01:35:06 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Ve4CD-0008Fc-6u; Wed, 06 Nov 2013 14:35:01 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Ve4C2-0008EG-7z for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2013 14:34:50 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Ve4C2-0004ut-3z for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2013 14:34:50 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/5] UBUNTU: [Config] armhf: build in pstore-ram Date: Wed, 6 Nov 2013 15:34:45 +0100 Message-Id: <1383748487-13886-4-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1383748487-13886-1-git-send-email-paolo.pisati@canonical.com> References: <1383748487-13886-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Rob Herring BugLink: http://bugs.launchpad.net/bugs/1248492 Build in pstore-ram and enable console support. Signed-off-by: Rob Herring (cherry picked from commit 8daabcd640037a09f5f32b2d4203001866c4a983) Signed-off-by: Paolo Pisati --- 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