summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 20:53:26 +0100
committerTom Rini <trini@konsulko.com>2015-11-21 21:50:24 -0500
commitd738746cc357e2157fce69f1fd5b25692ac640d1 (patch)
treeed74e29a3798e3497d634f41eec5ab8a0dc4689c /common
parent52cd47c9a5b467dd865e872647e9820d85e4292b (diff)
downloadblackbird-obmc-uboot-d738746cc357e2157fce69f1fd5b25692ac640d1.tar.gz
blackbird-obmc-uboot-d738746cc357e2157fce69f1fd5b25692ac640d1.zip
eeprom: Pull out CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS
Pull this macro to the beginning of the cmd_eeprom.c and remove another nasty ifdef from the code. Note that this is legal, since udelay(0) changes the behavior only such that it pings the WDT if WDT is enabled and otherwise does not wait. 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, 4 insertions, 2 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 040ab5ffd9..8451d63657 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -29,6 +29,10 @@
#define CONFIG_SYS_I2C_SPEED 50000
#endif
+#ifndef CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 0
+#endif
+
/*
* for CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 2 (16-bit EEPROM address) offset is
* 0x000nxxxx for EEPROM address selectors at n, offset xxxx in EEPROM.
@@ -211,9 +215,7 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
buffer += len;
offset += len;
-#if defined(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS)
udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
-#endif
}
eeprom_write_enable(dev_addr, 0);
OpenPOWER on IntegriCloud