diff options
author | Sergey Lapin <slapin@ossfans.org> | 2013-01-14 03:46:50 +0000 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2013-05-31 17:12:03 -0500 |
commit | dfe64e2c89731a3f9950d7acd8681b68df2bae03 (patch) | |
tree | 880eae93d5f4bd3e9747960eea71502c67e49d8e /drivers/mtd/Makefile | |
parent | a1b81ab26fbbdcbaa6e2a096397c75415181c298 (diff) | |
download | u-boot-midas-dfe64e2c89731a3f9950d7acd8681b68df2bae03.tar.gz u-boot-midas-dfe64e2c89731a3f9950d7acd8681b68df2bae03.tar.bz2 u-boot-midas-dfe64e2c89731a3f9950d7acd8681b68df2bae03.zip |
mtd: resync with Linux-3.7.1
This patch is essentially an update of u-boot MTD subsystem to
the state of Linux-3.7.1 with exclusion of some bits:
- the update is concentrated on NAND, no onenand or CFI/NOR/SPI
flashes interfaces are updated EXCEPT for API changes.
- new large NAND chips support is there, though some updates
have got in Linux-3.8.-rc1, (which will follow on top of this patch).
To produce this update I used tag v3.7.1 of linux-stable repository.
The update was made using application of relevant patches,
with changes relevant to U-Boot-only stuff sticked together
to keep bisectability. Then all changes were grouped together
to this patch.
Signed-off-by: Sergey Lapin <slapin@ossfans.org>
[scottwood@freescale.com: some eccstrength and build fixes]
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/Makefile')
-rw-r--r-- | drivers/mtd/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 543c845ff0..99f39fc752 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -25,7 +25,9 @@ include $(TOPDIR)/config.mk LIB := $(obj)libmtd.o -COBJS-$(CONFIG_MTD_DEVICE) += mtdcore.o +ifneq (,$(findstring y,$(CONFIG_MTD_DEVICE)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND))) +COBJS-y += mtdcore.o +endif COBJS-$(CONFIG_MTD_PARTITIONS) += mtdpart.o COBJS-$(CONFIG_MTD_CONCAT) += mtdconcat.o COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o |