]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: BCM: Do not select CONFIG_MTD_NAND_BRCMNAND
authorFlorian Fainelli <f.fainelli@gmail.com>
Sat, 27 Jun 2015 16:25:43 +0000 (09:25 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 1 Jul 2015 20:04:13 +0000 (13:04 -0700)
This reverts 7dc95b40f599293aedf30432749ad25b51549041 ("ARM: BCM: Enable
NAND support for iProc SoCs") since it creates an unmet dependency for
MTD_NAND_BRCMNAND which depends on MTD and MTD_NAND, this results in the
following build failure for brcmnand:

 LD      init/built-in.o
drivers/built-in.o: In function `brcmnand_remove':
/home/fainelli/dev/linux/drivers/mtd/nand/brcmnand/brcmnand.c:2234:
undefined reference to `nand_release'
drivers/built-in.o: In function `brcmnand_init_cs':
/home/fainelli/dev/linux/drivers/mtd/nand/brcmnand/brcmnand.c:1933:
undefined reference to `nand_scan_ident'
/home/fainelli/dev/linux/drivers/mtd/nand/brcmnand/brcmnand.c:1958:
undefined reference to `nand_scan_tail'
Makefile:931: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1

Instead, select this driver an all dependencies on the
multi_v7_defconfig.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/mach-bcm/Kconfig

index e9184feffc4e5b55d46008be3f3587d2756ea6e3..0ac9e4b3b26525b1ff466ad60a92f6a79a1204c9 100644 (file)
@@ -19,7 +19,6 @@ config ARCH_BCM_IPROC
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select PINCTRL
-       select MTD_NAND_BRCMNAND
        help
          This enables support for systems based on Broadcom IPROC architected SoCs.
          The IPROC complex contains one or more ARM CPUs along with common