diff options
author | Wolfgang Denk <wd@denx.de> | 2012-03-03 15:15:07 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-03-03 15:15:07 +0100 |
commit | e91004201c4265edf7897c4f8e0c21cd1dce0505 (patch) | |
tree | 97ca0cd21a4909774d9475f3198b610eeb7324c9 /drivers/mtd/nand/Makefile | |
parent | 8a1239e74cdf4d94738eb71928769d6e78bcc78c (diff) | |
parent | cfdae12f37ad126d1198f6c1ffa4ada9e69dd206 (diff) | |
download | u-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.zip u-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.tar.gz u-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash:
cmd_nand.c: Fix 'nand dump' after latest MTD resync
mtd/nand:Fix wrong usage of is_blank() in fsl_ifc_run_command
mtd/nand: Fix IFC driver to support 2K NAND page
nand: reinstate lazy bad block scanning
Revert "nand: make 1-bit software ECC configurable"
Diffstat (limited to 'drivers/mtd/nand/Makefile')
-rw-r--r-- | drivers/mtd/nand/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 998fc73..1d1b628 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -39,7 +39,7 @@ COBJS-y += nand_bbt.o COBJS-y += nand_ids.o COBJS-y += nand_util.o endif -COBJS-$(CONFIG_MTD_ECC_SOFT) += nand_ecc.o +COBJS-y += nand_ecc.o COBJS-y += nand_base.o COBJS-$(CONFIG_NAND_ECC_BCH) += nand_bch.o |