From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu --- drivers/mtd/Makefile | 6 +++--- drivers/mtd/at45.c | 2 -- drivers/mtd/cfi_flash.c | 3 --- drivers/mtd/mw_eeprom.c | 5 ----- 4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index ff932a1..e1bf095 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -25,10 +25,10 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libmtd.a
-COBJS-y += at45.o -COBJS-y += cfi_flash.o +COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o +COBJS-$(CFG_FLASH_CFI_DRIVER) += cfi_flash.o COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o -COBJS-y += mw_eeprom.o +COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o
COBJS := $(COBJS-y) diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c index a9d13ff..4739e04 100644 --- a/drivers/mtd/at45.c +++ b/drivers/mtd/at45.c @@ -21,7 +21,6 @@ #include <config.h> #include <common.h>
-#ifdef CONFIG_HAS_DATAFLASH #include <dataflash.h>
/* @@ -559,4 +558,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc) AT91F_DataFlashGetStatus(pDesc); return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C); } -#endif diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c0ea97b..5bed30d 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -39,7 +39,6 @@ #include <asm/io.h> #include <asm/byteorder.h> #include <environment.h> -#ifdef CFG_FLASH_CFI_DRIVER
/* * This file implements a Common Flash Interface (CFI) driver for @@ -2010,5 +2009,3 @@ unsigned long flash_init (void) #endif return (size); } - -#endif /* CFG_FLASH_CFI */ diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c index 2b33488..f32ced4 100644 --- a/drivers/mtd/mw_eeprom.c +++ b/drivers/mtd/mw_eeprom.c @@ -1,9 +1,6 @@ /* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
#include <common.h> - -#ifdef CONFIG_MW_EEPROM - #include <ssi.h>
/* @@ -237,5 +234,3 @@ int mw_eeprom_probe(int dev) } return 0; } - -#endif