Remove redundant config checks when the subdirectory's Makefile is already conditionally processed. Add more conditional processing when the subdirectory can be selected/deselected as a whole. Signed-off-by: Kyle Spaans <kspaans@xxxxxxxxxxxx> Reviewed-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> --- compile tested on Debian Lenny drivers/mtd/Makefile | 6 +++++- drivers/mtd/lpddr/Makefile | 2 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/onenand/Makefile | 4 ++-- drivers/mtd/tests/Makefile | 16 ++++++++-------- drivers/mtd/ubi/Makefile | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 760abc5..3bf50bd 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -30,6 +30,10 @@ obj-$(CONFIG_MTD_OOPS) += mtdoops.o nftl-objs := nftlcore.o nftlmount.o inftl-objs := inftlcore.o inftlmount.o -obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ +obj-y += chips/ maps/ devices/ +obj-$(CONFIG_MTD_TESTS) += tests/ +obj-$(CONFIG_MTD_LPDDR) += lpddr/ +obj-$(CONFIG_MTD_NAND) += nand/ +obj-$(CONFIG_MTD_ONENAND) += onenand/ obj-$(CONFIG_MTD_BI) += ubi/ diff --git a/drivers/mtd/lpddr/Makefile b/drivers/mtd/lpddr/Makefile index da48e46..0e9be65 100644 --- a/drivers/mtd/lpddr/Makefile +++ b/drivers/mtd/lpddr/Makefile @@ -3,4 +3,4 @@ # obj-$(CONFIG_MTD_QINFO_PROBE) += qinfo_probe.o -obj-$(CONFIG_MTD_LPDDR) += lpddr_cmds.o +obj-y += lpddr_cmds.o diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index e8ab884..8fe5869 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -2,7 +2,7 @@ # linux/drivers/nand/Makefile # -obj-$(CONFIG_MTD_NAND) += nand.o +obj-y += nand.o obj-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile index 2b7884c..f6a8495 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile @@ -3,12 +3,12 @@ # # Core functionality. -obj-$(CONFIG_MTD_ONENAND) += onenand.o +obj-y += onenand.o # Board specific. obj-$(CONFIG_MTD_ONENAND_GENERIC) += generic.o obj-$(CONFIG_MTD_ONENAND_OMAP2) += omap2.o -obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung.o +obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung.o # Simulator obj-$(CONFIG_MTD_ONENAND_SIM) += onenand_sim.o diff --git a/drivers/mtd/tests/Makefile b/drivers/mtd/tests/Makefile index b44dcab..14adc55 100644 --- a/drivers/mtd/tests/Makefile +++ b/drivers/mtd/tests/Makefile @@ -1,8 +1,8 @@ -obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_speedtest.o -obj-$(CONFIG_MTD_TESTS) += mtd_stresstest.o -obj-$(CONFIG_MTD_TESTS) += mtd_subpagetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_torturetest.o -obj-$(CONFIG_MTD_TESTS) += mtd_nandecctest.o +obj-y += mtd_oobtest.o +obj-y += mtd_pagetest.o +obj-y += mtd_readtest.o +obj-y += mtd_speedtest.o +obj-y += mtd_stresstest.o +obj-y += mtd_subpagetest.o +obj-y += mtd_torturetest.o +obj-y += mtd_nandecctest.o diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index c9302a5..caf0316 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_MTD_UBI) += ubi.o +obj-y += ubi.o ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o scan.o ubi-y += misc.o -- 1.5.6.5
Attachment:
signature.asc
Description: Digital signature
