diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /drivers/mtd/onenand | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2 | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mtd/onenand')
| -rw-r--r-- | drivers/mtd/onenand/Makefile | 3 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/onenand/onenand_uboot.c | 5 |
4 files changed, 2 insertions, 16 deletions
diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile index 92074b2..1d35a57 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile @@ -25,8 +25,9 @@ include $(TOPDIR)/config.mk LIB := $(obj)libonenand.a -COBJS := onenand_uboot.o onenand_base.o onenand_bbt.o +COBJS-$(CONFIG_CMD_ONENAND) := onenand_uboot.o onenand_base.o onenand_bbt.o +COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index ded1706..7c9438b 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -10,9 +10,6 @@ */ #include <common.h> - -#ifdef CONFIG_CMD_ONENAND - #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> @@ -1304,5 +1301,3 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) void onenand_release(struct mtd_info *mtd) { } - -#endif /* CONFIG_CMD_ONENAND */ diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 87344ab..0abaa1a 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -15,9 +15,6 @@ */ #include <common.h> - -#ifdef CONFIG_CMD_ONENAND - #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> @@ -261,5 +258,3 @@ int onenand_default_bbt(struct mtd_info *mtd) return onenand_scan_bbt(mtd, bbm->badblock_pattern); } - -#endif /* CFG_CMD_ONENAND */ diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index bd7466a..d614450 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -14,9 +14,6 @@ */ #include <common.h> - -#ifdef CONFIG_CMD_ONENAND - #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> @@ -37,5 +34,3 @@ void onenand_init(void) puts("OneNAND: "); print_size(onenand_mtd.size, "\n"); } - -#endif /* CONFIG_CMD_ONENAND */ |