| Message ID | 1447185213-5799-10-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hello Marek, Am 10.11.2015 um 20:53 schrieb Marek Vasut: > 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> > --- > common/cmd_eeprom.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c > index 040ab5f..8451d63 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); >
On Tue, Nov 10, 2015 at 08:53:26PM +0100, Marek Vasut wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 040ab5f..8451d63 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);
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> --- common/cmd_eeprom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)