diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2014-12-09 12:05:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-17 11:02:42 +0100 |
| commit | 704f59fe652bfca0d649390956530cb3ae43db24 (patch) | |
| tree | 55e96a62844b9892aba94c276357eb326c490ae3 | |
| parent | 698f8dc5333c782567cc1edcd8eb6828f196fed8 (diff) | |
| download | barebox-704f59fe652bfca0d649390956530cb3ae43db24.tar.gz barebox-704f59fe652bfca0d649390956530cb3ae43db24.tar.xz | |
Revert "ARM: i.MX: Make NAND related Kconfig options depend on MTD"
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@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a931de921e..9ac36e1453 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 |