summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-04-01 07:30:51 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-04-01 07:30:51 +0200
commitb5873f1732b92a25690e1513b90dfb0d644f6697 (patch)
tree47a0beaef3b4966647fd3edd30196838fc04a286
parent3ca7c558eba36332556bc470d45e2f5d42bd0ca6 (diff)
dataflash: Move CONFIG_HAS_DATAFLASH to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--drivers/mtd/Makefile8
-rw-r--r--drivers/mtd/dataflash.c3
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 952e919843..ff932a1b6b 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -23,17 +23,17 @@
include $(TOPDIR)/config.mk
-LIB := $(obj)libmtd.a
+LIB := $(obj)libmtd.a
COBJS-y += at45.o
COBJS-y += cfi_flash.o
-COBJS-y += dataflash.o
+COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o
COBJS-y += mw_eeprom.o
COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
COBJS := $(COBJS-y)
-SRCS := $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS))
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 85cbc5f783..d8f78f20a8 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -19,7 +19,6 @@
*/
#include <common.h>
#include <config.h>
-#ifdef CONFIG_HAS_DATAFLASH
#include <asm/hardware.h>
#include <dataflash.h>
@@ -475,5 +474,3 @@ void dataflash_perror (int err)
break;
}
}
-
-#endif