[PATCH 5/5] Revert "ARM: i.MX: Make NAND related Kconfig options depend on MTD"
Lucas Stach
l.stach at pengutronix.de
Tue Dec 9 03:05:46 PST 2014
This reverts commit 4b17d73c7da2, as it is incomplete and partially
broken. ARCH_IMX_EXTERNAL_BOOT_NAND does not depend on MTD, it just uses
some defines from the mtd/nand header, but does not actually depend on MTD
being compiled in.
For the other two cases there is a more complete fix merged with commit
57b584d748d4 that also enables the needed MTD write support.
Fixes:
(MACH_TX25 && MACH_PCA100 && MACH_PCM038) selects ARCH_IMX_EXTERNAL_BOOT_NAND
which has unmet direct dependencies (ARCH_IMX && MTD)
Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
---
arch/arm/mach-imx/Kconfig | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index a931de921eef..9ac36e145349 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -102,13 +102,11 @@ endchoice
config ARCH_IMX_EXTERNAL_BOOT_NAND
bool
- depends on MTD
depends on ARCH_IMX25 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35
prompt "Support Starting barebox from NAND in external bootmode"
config BAREBOX_UPDATE_IMX_EXTERNAL_NAND
bool
- depends on MTD
depends on ARCH_IMX_EXTERNAL_BOOT_NAND
depends on BAREBOX_UPDATE
depends on MTD
@@ -117,7 +115,6 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND
config BAREBOX_UPDATE_IMX6_NAND
bool
- depends on MTD
depends on ARCH_IMX6
depends on BAREBOX_UPDATE
depends on MTD
--
2.1.3
More information about the barebox
mailing list