From patchwork Thu Sep 8 18:59:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 9321953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 546FB60231 for ; Thu, 8 Sep 2016 19:02:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AE042997D for ; Thu, 8 Sep 2016 19:02:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F6DC299C4; Thu, 8 Sep 2016 19:02:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E55222997D for ; Thu, 8 Sep 2016 19:02:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi4YL-0001BX-RX; Thu, 08 Sep 2016 19:00:01 +0000 Received: from mail-oi0-f65.google.com ([209.85.218.65]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi4YG-00019V-N3 for linux-arm-kernel@lists.infradead.org; Thu, 08 Sep 2016 18:59:57 +0000 Received: by mail-oi0-f65.google.com with SMTP id x125so3610538oia.1 for ; Thu, 08 Sep 2016 11:59:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2ZRhKyZfH+2+KT+X7P6u24RMnDBj14gyTaRDNbuaCSA=; b=dq4LTrsJiVIANZg7bkCNTMTGoePlStMRCzqK4zpHE/9ZNQYHt8K/U58KOanAfukSKX e6F/R6Il8xK1Qp+CRIe2JwMjJBcuwLAx/5EuA8f+cZU9XRSuPvIzt+0hd7x9cYA9WUwP cdKWCMTznfjFJHJgfpzACI0AfJdtyl50M8xpNy/2fuKIoKAgCpVs2xDpIPhCRh8GG+lR O7sYhPPzava5XP8acMZ30pG/EJmojxB0MXOAFuN/48TlSJYypcIQGX+jrWoGh0lbBQ69 IPSs/85q03P50g6acq6sNyOCxPQzH90xD5NC85S+TlXX8dBPpK8GDVQGY3OdjKxmzgOJ vWqg== X-Gm-Message-State: AE9vXwONFgYq8EDdB1NBocz32PEL2lFRiPqdrH4W6R6DdczaXabofJzRlBjvIYN616kImA== X-Received: by 10.202.239.4 with SMTP id n4mr1595820oih.114.1473361175629; Thu, 08 Sep 2016 11:59:35 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id p6sm14436434ota.32.2016.09.08.11.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 11:59:34 -0700 (PDT) From: Rob Herring To: Andrew Morton Subject: [PATCH 1/3] config: android: move device mapper options to recommended Date: Thu, 8 Sep 2016 13:59:32 -0500 Message-Id: <20160908185934.18098-1-robh@kernel.org> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160908_115956_823427_3740923B X-CRM114-Status: UNSURE ( 9.50 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amit Pundir , John Stultz , Dmitry Shmidt , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP CONFIG_MD is in recommended, but other dependent options like DM_CRYPT and DM_VERITY options are in base. The result is the options in base don't get enabled when applying both base and recommended fragments. Move all the options to recommended. Signed-off-by: Rob Herring Acked-by: John Stultz --- kernel/configs/android-base.config | 4 ---- kernel/configs/android-recommended.config | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 9f748ed..19eb7ac 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -11,7 +11,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ARMV8_DEPRECATED=y CONFIG_ASHMEM=y CONFIG_AUDIT=y -CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_INITRD=y CONFIG_CGROUPS=y CONFIG_CGROUP_CPUACCT=y @@ -19,9 +18,6 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_CP15_BARRIER_EMULATION=y -CONFIG_DM_CRYPT=y -CONFIG_DM_VERITY=y -CONFIG_DM_VERITY_FEC=y CONFIG_EMBEDDED=y CONFIG_FB=y CONFIG_HIGH_RES_TIMERS=y diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index e3b953e..297756b 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -6,12 +6,16 @@ # CONFIG_PM_WAKELOCKS_GC is not set # CONFIG_VT is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_COMPACTION=y CONFIG_DEBUG_RODATA=y +CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y +CONFIG_DM_VERITY=y +CONFIG_DM_VERITY_FEC=y CONFIG_DRAGONRISE_FF=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_EXT4_FS=y