sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Revert "ARM: i.MX: Make NAND related Kconfig options depend on MTD" 

This reverts commit 4b17d73c7d, 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
57b584d748 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>
This commit is contained in:
Lucas Stach 2014-12-09 12:05:46 +01:00 committed by Sascha Hauer
parent 698f8dc533
commit 704f59fe65
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-imx/Kconfig
View File

@ -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