1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 1584e86694..617a9c2638 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,26 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-# Generic NAND options
-obj-$(CONFIG_NAND)			+= nand_ecc.o
-obj-$(CONFIG_MTD_NAND_ECC_SW_BCH)	+= nand_bch.o
-obj-$(CONFIG_NAND)			+= nand_ids.o
-obj-$(CONFIG_NAND)			+= nand_base.o nand-bb.o nand_timings.o
-obj-$(CONFIG_NAND)			+= nand_legacy.o nand_onfi.o nand_amd.o
-obj-$(CONFIG_NAND)			+= nand_esmt.o nand_hynix.o nand_macronix.o
-obj-$(CONFIG_NAND)			+= nand_micron.o nand_samsung.o nand_toshiba.o
-obj-$(CONFIG_NAND)			+= nand_jedec.o core.o bbt.o
-obj-$(CONFIG_NAND)			+= nand_bbt.o
+obj-$(CONFIG_MTD_NAND_CORE) += core.o bbt.o nand-bb.o
 
-obj-$(CONFIG_MTD_NAND_NOMADIK)		+= nomadik_nand.o
-obj-$(CONFIG_NAND_IMX)			+= nand_imx.o
-obj-$(CONFIG_NAND_OMAP_GPMC)		+= nand_omap_gpmc.o nand_omap_bch_decoder.o
-obj-$(CONFIG_MTD_NAND_OMAP_ELM)		+= omap_elm.o
-obj-$(CONFIG_NAND_ORION)		+= nand_orion.o
-obj-$(CONFIG_NAND_MRVL_NFC)		+= nand_mrvl_nfc.o
-obj-$(CONFIG_NAND_ATMEL)		+= atmel_nand.o
-obj-$(CONFIG_NAND_S3C24XX)		+= nand_s3c24xx.o
-pbl-$(CONFIG_NAND_S3C24XX)		+= nand_s3c24xx.o
-obj-$(CONFIG_NAND_MXS)			+= nand_mxs.o
-obj-$(CONFIG_MTD_NAND_DENALI)		+= nand_denali.o
-obj-$(CONFIG_MTD_NAND_DENALI_DT)	+= nand_denali_dt.o
-obj-$(CONFIG_NAND_FSL_IFC)		+= nand_fsl_ifc.o
+obj-y += raw/
+
+obj-$(CONFIG_MTD_NAND_ECC) += ecc.o
+obj-$(CONFIG_MTD_NAND_ECC_SW_HAMMING) += ecc-sw-hamming.o
+obj-$(CONFIG_MTD_NAND_ECC_SW_BCH) += ecc-sw-bch.o