summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:52 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:47:52 +0200
commitd1034bc8db60fa6bd419328baf6a75cb0645cee8 (patch)
tree3d11680ab90a0b7df9def1069aa4b9b5773778d3
parentbf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb (diff)
downloadu-boot-imx-d1034bc8db60fa6bd419328baf6a75cb0645cee8.zip
u-boot-imx-d1034bc8db60fa6bd419328baf6a75cb0645cee8.tar.gz
u-boot-imx-d1034bc8db60fa6bd419328baf6a75cb0645cee8.tar.bz2
cmd_eeprom: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--common/Makefile3
-rw-r--r--common/cmd_eeprom.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile
index 9001237..fea0caf 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -80,7 +80,8 @@ endif
COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o
COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
-COBJS-y += cmd_eeprom.o
+COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
+COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 5034b5e..44d44fe 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -42,8 +42,6 @@
#include <command.h>
#include <i2c.h>
-#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
-
extern void eeprom_init (void);
extern int eeprom_read (unsigned dev_addr, unsigned offset,
uchar *buffer, unsigned cnt);
@@ -52,7 +50,6 @@ extern int eeprom_write (unsigned dev_addr, unsigned offset,
#if defined(CFG_EEPROM_WREN)
extern int eeprom_write_enable (unsigned dev_addr, int state);
#endif
-#endif
#if defined(CFG_EEPROM_X40430)
@@ -121,8 +118,6 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
* 0x00000nxx for EEPROM address selectors and page number at n.
*/
-#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
-
#ifndef CONFIG_SPI
#if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
#error CFG_I2C_EEPROM_ADDR_LEN must be 1 or 2
@@ -422,7 +417,6 @@ void eeprom_init (void)
}
/*-----------------------------------------------------------------------
*/
-#endif
/***************************************************/