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: 75817 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp999902qgf; Thu, 8 Sep 2016 11:59:43 -0700 (PDT) X-Received: by 10.66.220.106 with SMTP id pv10mr1996689pac.81.1473361183889; Thu, 08 Sep 2016 11:59:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s23si10083037pfd.23.2016.09.08.11.59.43; Thu, 08 Sep 2016 11:59:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933159AbcIHS7h (ORCPT + 27 others); Thu, 8 Sep 2016 14:59:37 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34700 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932808AbcIHS7g (ORCPT ); Thu, 8 Sep 2016 14:59:36 -0400 Received: by mail-oi0-f68.google.com with SMTP id x125so3610540oia.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=NTRo5nuLelqR7NwACuT13grWYaPdl3uOldyX+4p2F55rCQtgJ2CYE8+5SRV+QLY9uN Vt5G16Hlk+hw1d/E6LVUCowg6QSjvULEVVo9pBcowH4YximT//F/QvsVc5Kb+wkQY0b0 gfwJNR52+L9O/L421UHwFUczLKleNwMMdVcqIzoYrMrRXM70OErdbV3HalKSL2iGcTj+ gLI3WJrswZuCCfTeaxlfNaJHBqe6AspbdP5fNGRwGCXqlj4bI0mWBhpF/Q8s3efh0Z8I 2FMSZGEHcGLb4hrVXXIOKzcUtiGVEynJ0ooACIuv48ySXAfytdUP3CWhbnxAItOZhZZ+ NuSQ== X-Gm-Message-State: AE9vXwOkIkBDTCiIBh7vsiZ+IY5QLMVbLCkfPvdR52TwqnEeOXIkU1DS/NsxqHyVXAPh3A== 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 Cc: Amit Pundir , John Stultz , Dmitry Shmidt , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- kernel/configs/android-base.config | 4 ---- kernel/configs/android-recommended.config | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.9.3 Acked-by: John Stultz 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