Patchwork [U-Boot,v3,5/5] da850evm: read MAC address from I2C EEPROM on AM18x EVM

login
register
mail settings
Submitter Hadli, Manjunath
Date Oct. 11, 2011, 7:06 a.m.
Message ID <1318316800-10701-6-git-send-email-manjunath.hadli@ti.com>
Download mbox | patch
Permalink /patch/118864/
State Deferred
Delegated to: Tom Rini
Headers show

Comments

Hadli, Manjunath - Oct. 11, 2011, 7:06 a.m.
From: Manjunath Hadli <manjunath.hadli@ti.com>

The AM18x EVM contains MAC address in I2C EEPROM. Introduced
a new macro CONFIG_MAC_ADDR_IN_EEPROM to where to look for mac
address. This patch reads MAC address from I2C EEPROM and updates
environment variable.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
 board/davinci/da8xxevm/da850evm.c |   10 +++++++++-
 include/configs/da850_am18xevm.h  |    7 +++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

Patch

diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 6aa76cb..f3e50f7 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -261,13 +261,15 @@  static void dspwake(void)
 
 int misc_init_r(void)
 {
+	uint8_t enetaddr[8];
 	uchar buff[8];
 	int ret;
 
 	dspwake();
 
-#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH
+#if defined(CONFIG_MAC_ADDR_IN_SPIFLASH) || defined(CONFIG_MAC_ADDR_IN_EEPROM)
 	if (!eth_getenv_enetaddr("ethaddr", buff)) {
+#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH
 		ret = get_mac_addr(buff);
 		if (ret != 0)
 			return -EINVAL;
@@ -278,6 +280,12 @@  int misc_init_r(void)
 		}
 
 		eth_setenv_enetaddr("ethaddr", buff);
+#else
+		/* Read Ethernet MAC address from EEPROM */
+		if (dvevm_read_mac_address(enetaddr))
+			/* Set Ethernet MAC address from EEPROM */
+			davinci_sync_env_enetaddr(enetaddr);
+#endif
 	}
 #endif
 	return 0;
diff --git a/include/configs/da850_am18xevm.h b/include/configs/da850_am18xevm.h
index ee574da..7f88424 100644
--- a/include/configs/da850_am18xevm.h
+++ b/include/configs/da850_am18xevm.h
@@ -92,6 +92,12 @@ 
 #define CONFIG_SYS_I2C_EXPANDER_ADDR   0x20
 
 /*
+ * I2C EEPROM definitions EEPROM chip
+ */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		2
+#define CONFIG_SYS_I2C_EEPROM_ADDR		0x50
+
+/*
  * Flash & Environment
  */
 #ifdef CONFIG_USE_NAND
@@ -172,6 +178,7 @@ 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
+#define CONFIG_MAC_ADDR_IN_EEPROM
 
 /*
  * Linux Information