summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/Makefile
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-06-26 19:03:26 -0500
committerScott Wood <scottwood@freescale.com>2015-08-25 22:53:57 -0500
commitd3963721d93fafa8da0f78de17602ef308ec15ba (patch)
tree3585b254c72b9d2122a456c433f24dfc723c8465 /drivers/mtd/nand/Makefile
parent86a720aafce5b2571af66b8d7e04b144c05b1b8b (diff)
downloadtalos-obmc-uboot-d3963721d93fafa8da0f78de17602ef308ec15ba.tar.gz
talos-obmc-uboot-d3963721d93fafa8da0f78de17602ef308ec15ba.zip
nand: Sync with Linux v4.1
Update the NAND code to match Linux v4.1. The previous sync was from Linux v3.15 in commit 4e67c57125290b25. CONFIG_SYS_NAND_RESET_CNT is removed, as the upstream Linux code now has its own timeout. Plus, CONFIG_SYS_NAND_RESET_CNT was undocumented and not selected by any board. Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand/Makefile')
-rw-r--r--drivers/mtd/nand/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 46dce72bfe..6d239cafa6 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -34,6 +34,7 @@ obj-y += nand_ids.o
obj-y += nand_util.o
obj-y += nand_ecc.o
obj-y += nand_base.o
+obj-y += nand_timings.o
endif # not spl
OpenPOWER on IntegriCloud