From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 16 Nov 2015 12:28:12 +0100 Subject: [U-Boot] [PATCH 09/17] eeprom: Make eeprom_write_enable() weak In-Reply-To: <1447185213-5799-9-git-send-email-marex@denx.de> References: <1447185213-5799-1-git-send-email-marex@denx.de> <1447185213-5799-9-git-send-email-marex@denx.de> Message-ID: <5649BDCC.9050901@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Marek, Am 10.11.2015 um 20:53 schrieb Marek Vasut: > Make this function weak and implement it's weak implementation > so that the boards can just reimplement it. This zaps the horrid > CONFIG_SYS_EEPROM_WREN macro. > > Signed-off-by: Marek Vasut > Cc: Simon Glass > Cc: Tom Rini > Cc: Heiko Schocher > --- > common/cmd_eeprom.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko > > diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c > index 5979993..040ab5f 100644 > --- a/common/cmd_eeprom.c > +++ b/common/cmd_eeprom.c > @@ -44,9 +44,10 @@ > #endif > #endif > > -#if defined(CONFIG_SYS_EEPROM_WREN) > -extern int eeprom_write_enable (unsigned dev_addr, int state); > -#endif > +__weak int eeprom_write_enable(unsigned dev_addr, int state) > +{ > + return 0; > +} > > void eeprom_init(void) > { > @@ -163,9 +164,8 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn > int rcode = 0; > uchar addr[3]; > > -#if defined(CONFIG_SYS_EEPROM_WREN) > - eeprom_write_enable (dev_addr,1); > -#endif > + eeprom_write_enable(dev_addr, 1); > + > /* > * Write data until done or would cross a write page boundary. > * We must write the address again when changing pages > @@ -215,9 +215,9 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn > udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000); > #endif > } > -#if defined(CONFIG_SYS_EEPROM_WREN) > - eeprom_write_enable (dev_addr,0); > -#endif > + > + eeprom_write_enable(dev_addr, 0); > + > return rcode; > } > > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany