From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Thu, 29 Oct 2015 14:34:55 +0000 (-0200)
Subject: ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A
X-Git-Tag: v4.5-rc1~41^2~12^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d0cc60abb3eb0c471ab355749d49897ab356e16a;p=linux.git

ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A

imx_v6_v7_defconfig is not suitable for booting LS1021 as it needs
LPAE.

Remove this option.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 4187f69f6630..d83e775a6be7 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -42,7 +42,6 @@ CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX7D=y
-CONFIG_SOC_LS1021A=y
 CONFIG_SOC_VF610=y
 CONFIG_PCI=y
 CONFIG_PCI_IMX6=y