summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 20:53:27 +0100
committerTom Rini <trini@konsulko.com>2015-11-21 21:50:24 -0500
commit8eee40a602deacb2ec0ebd1deed3e732bd470bbc (patch)
treec69de11bc8f59a8888b74d0e4200e89dfddad926 /common
parentd738746cc357e2157fce69f1fd5b25692ac640d1 (diff)
downloadblackbird-obmc-uboot-8eee40a602deacb2ec0ebd1deed3e732bd470bbc.tar.gz
blackbird-obmc-uboot-8eee40a602deacb2ec0ebd1deed3e732bd470bbc.zip
eeprom: Suck the ifdef into eeprom_init()
Just suck the ugly ifdef around eeprom_init() call into eeprom_init() function itself. This puts all of the ifdef mess into one place. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_eeprom.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 8451d63657..c38c534968 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -57,7 +57,7 @@ void eeprom_init(void)
{
/* SPI EEPROM */
#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
- spi_init_f ();
+ spi_init_f();
#endif
/* I2C EEPROM */
@@ -248,9 +248,7 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
off = simple_strtoul(*args++, NULL, 16);
cnt = simple_strtoul(*args++, NULL, 16);
-# if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
- eeprom_init ();
-# endif /* !CONFIG_SPI */
+ eeprom_init();
if (strcmp (argv[1], "read") == 0) {
printf(fmt, dev_addr, argv[1], addr, off, cnt);
OpenPOWER on IntegriCloud