Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7cd6824 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Brian Norris
Browse files

mtd: nand: Force omap_elm to be built as a module if omap2_nand is a module 



This commit adds a hidden option to build the omap_elm as a module, if
omap2_nand is a module (and similarly in the built-in case).

This fixes the following build error when omap2_nand is chosen built-in,
and omap_elm is chosen as a module:

drivers/built-in.o: In function `omap_nand_probe':
drivers/mtd/nand/omap2.c:2010: undefined reference to `elm_config'
drivers/mtd/nand/omap2.c:1980: undefined reference to `elm_config'
drivers/mtd/nand/omap2.c:1927: undefined reference to `elm_config'
drivers/built-in.o: In function `omap_elm_correct_data':
drivers/mtd/nand/omap2.c:1444: undefined reference to `elm_decode_bch_error_page'

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 32f1b7c8

drivers/mtd/nand/Kconfig

+4 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ config MTD_NAND_OMAP2 




config MTD_NAND_OMAP_BCH

config MTD_NAND_OMAP_BCH

	depends on MTD_NAND_OMAP2

	depends on MTD_NAND_OMAP2

	tristate "Support hardware based BCH error correction"

	bool "Support hardware based BCH error correction"

	default n

	default n

	select BCH

	select BCH

	help

	help
@@ -106,6 +106,9 @@ config MTD_NAND_OMAP_BCH 
	  legacy OMAP families like OMAP2xxx, OMAP3xxx do not have ELM engine

	  legacy OMAP families like OMAP2xxx, OMAP3xxx do not have ELM engine

	  so they should not enable this config symbol.

	  so they should not enable this config symbol.





config MTD_NAND_OMAP_BCH_BUILD

	def_tristate MTD_NAND_OMAP2 && MTD_NAND_OMAP_BCH



config MTD_NAND_IDS

config MTD_NAND_IDS

	tristate

	tristate

drivers/mtd/nand/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o 
obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o

obj-$(CONFIG_MTD_NAND_ATMEL)		+= atmel_nand.o

obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o

obj-$(CONFIG_MTD_NAND_GPIO)		+= gpio.o

obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o

obj-$(CONFIG_MTD_NAND_OMAP2) 		+= omap2.o

obj-$(CONFIG_MTD_NAND_OMAP_BCH)		+= omap_elm.o

obj-$(CONFIG_MTD_NAND_OMAP_BCH_BUILD)	+= omap_elm.o

obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o

obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx270_nand.o

obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o

obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o

obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o

obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o