summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 20:53:25 +0100
committerTom Rini <trini@konsulko.com>2015-11-21 21:50:23 -0500
commit52cd47c9a5b467dd865e872647e9820d85e4292b (patch)
tree053d9ea092b676f2f5ea033d07cd27af49b19a65
parent02c321cf88c14f330e696830554739d745bb359d (diff)
downloadtalos-obmc-uboot-52cd47c9a5b467dd865e872647e9820d85e4292b.tar.gz
talos-obmc-uboot-52cd47c9a5b467dd865e872647e9820d85e4292b.zip
eeprom: Make eeprom_write_enable() weak
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 <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>
-rw-r--r--common/cmd_eeprom.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 5979993912..040ab5ffd9 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;
}
OpenPOWER on IntegriCloud