From b059833c1b00d38608c6f858d828be3caa453252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com>
Date: Mon, 18 Jun 2018 12:31:50 +0300
Subject: [PATCH] ARM: lsdk.config: enable crypto options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move crypto options from ARMv8-specific config fragment to lsdk.config
(which is used both by ARMv7 and ARMv8) - since they are needed for both
SoCs.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
 arch/arm/configs/lsdk.config     | 3 +++
 arch/arm/configs/multi_v8.config | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/configs/lsdk.config b/arch/arm/configs/lsdk.config
index e56d7f25e1f512..f5c99585416ec1 100644
--- a/arch/arm/configs/lsdk.config
+++ b/arch/arm/configs/lsdk.config
@@ -15,6 +15,9 @@ CONFIG_NETLINK_DIAG=y
 CONFIG_OVERLAY_FS=y
 
 # network and misc
+CONFIG_INET_ESP=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
 CONFIG_VETH=y
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=y
diff --git a/arch/arm/configs/multi_v8.config b/arch/arm/configs/multi_v8.config
index 5c5b3b6ea98a2f..2203dabebc4402 100644
--- a/arch/arm/configs/multi_v8.config
+++ b/arch/arm/configs/multi_v8.config
@@ -9,9 +9,6 @@ CONFIG_MACVLAN=y
 CONFIG_FSL_SDK_FMAN=y
 CONFIG_FMAN_ARM=y
 CONFIG_FSL_SDK_DPAA_ETH=y
-CONFIG_INET_ESP=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
 # mdio
 CONFIG_FSL_XGMAC_MDIO=y
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
-- 
GitLab