diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 16:25:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 16:25:32 +0100 |
| commit | e987040bc914e0677e62600d2b510389632a2605 (patch) | |
| tree | fe9062cb560f1fd5d46e97d2110800b758334b47 /drivers/mtd/nand/Kconfig | |
| parent | ff3bea7fedd62a0c11b6b9468cf7e5c71b0f1a1a (diff) | |
| parent | 615076e1fc11a86efdc76c64ce65cd336684c742 (diff) | |
| download | barebox-e987040bc914e0677e62600d2b510389632a2605.tar.gz barebox-e987040bc914e0677e62600d2b510389632a2605.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index bc95195116..034bb6fe49 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -11,12 +11,12 @@ if NAND config NAND_IMX bool prompt "i.MX NAND driver" - depends on ARCH_IMX21 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35 || ARCH_IMX25 + depends on ARCH_IMX21 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35 || ARCH_IMX25 || ARCH_IMX51 config NAND_IMX_BOOT bool prompt "Support Starting barebox from NAND" - depends on NAND_IMX || NAND_IMX_V2 + depends on NAND_IMX && !ARCH_IMX51 choice depends on NAND_IMX_BOOT |