diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
commit | afbc526336447a7357e9c82852df0377d09a8089 (patch) | |
tree | 63360d749d3f02916a1239b3862c68d41d3f3d19 /common/cmd_eeprom.c | |
parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/cmd_eeprom.c')
-rw-r--r-- | common/cmd_eeprom.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index e5000e9ff3..44d44fe4d0 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -42,8 +42,6 @@ #include <command.h> #include <i2c.h> -#if defined(CFG_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(CFG_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 /***************************************************/ |