LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_eeprom: Move conditional compilation to Makefile 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-09-10 22:47:52 +02:00
parent bf5a7710ec
commit d1034bc8db
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/Makefile
View File

@ -80,7 +80,8 @@ endif
COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o
COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.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_ELF) += cmd_elf.o
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o

6
common/cmd_eeprom.c
View File

@ -42,8 +42,6 @@
#include <command.h> #include <command.h>
#include <i2c.h> #include <i2c.h>
#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
extern void eeprom_init (void); extern void eeprom_init (void);
extern int eeprom_read (unsigned dev_addr, unsigned offset, extern int eeprom_read (unsigned dev_addr, unsigned offset,
uchar *buffer, unsigned cnt); uchar *buffer, unsigned cnt);
@ -52,7 +50,6 @@ extern int eeprom_write (unsigned dev_addr, unsigned offset,
#if defined(CFG_EEPROM_WREN) #if defined(CFG_EEPROM_WREN)
extern int eeprom_write_enable (unsigned dev_addr, int state); extern int eeprom_write_enable (unsigned dev_addr, int state);
#endif #endif
#endif
#if defined(CFG_EEPROM_X40430) #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. * 0x00000nxx for EEPROM address selectors and page number at n.
*/ */
#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
#ifndef CONFIG_SPI #ifndef CONFIG_SPI
#if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2 #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 #error CFG_I2C_EEPROM_ADDR_LEN must be 1 or 2
@ -422,7 +417,6 @@ void eeprom_init (void)
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
#endif
/***************************************************/ /***************************************************/