Patchwork [U-Boot] da830: add support to read mac addr from EEPROM

login
register
mail settings
Submitter nagabhushana.netagunte@ti.com
Date Sept. 30, 2011, 11:39 a.m.
Message ID <1317382799-11205-1-git-send-email-nagabhushana.netagunte@ti.com>
Download mbox | patch
Permalink /patch/117106/
State Changes Requested
Headers show

Comments

nagabhushana.netagunte@ti.com - Sept. 30, 2011, 11:39 a.m.
From: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>

da830 boards have mac address stored in I2C EEPROM. This patch
adds support to restore mac address from EEPROM if environment variable
'ethaddr' is not set.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
---
 board/davinci/da8xxevm/da830evm.c |   20 ++++++++++++++++++++
 include/configs/da830evm.h        |    1 +
 2 files changed, 21 insertions(+), 0 deletions(-)
Mike Frysinger - Sept. 30, 2011, 3:49 p.m.
On Friday, September 30, 2011 07:39:59 nagabhushana.netagunte@ti.com wrote:
> --- a/board/davinci/da8xxevm/da830evm.c
> +++ b/board/davinci/da8xxevm/da830evm.c

this code looks fine ...

> --- a/include/configs/da830evm.h
> +++ b/include/configs/da830evm.h
>
> +#define CONFIG_MISC_INIT_R
>  #undef CONFIG_MISC_INIT_R

but NAK on this since i'm pretty sure this isn't doing what you're expecting
-mike
Nick Thompson - Oct. 3, 2011, 12:01 p.m.
On 30/09/11 12:39, nagabhushana.netagunte@ti.com wrote:
> From: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
>
> da830 boards have mac address stored in I2C EEPROM. This patch
> adds support to restore mac address from EEPROM if environment variable
> 'ethaddr' is not set.
>
> Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
> Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
> ---
>  board/davinci/da8xxevm/da830evm.c |   20 ++++++++++++++++++++
>  include/configs/da830evm.h        |    1 +
>  2 files changed, 21 insertions(+), 0 deletions(-)
>
> diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c
> index 0650653..69ed293 100644
> --- a/board/davinci/da8xxevm/da830evm.c
> +++ b/board/davinci/da8xxevm/da830evm.c
> @@ -188,6 +188,26 @@ int board_init(void)
>  
>  #define PHY_SW_I2C_ADDR	0x5f /* Address of PHY on i2c bus */
>  
> +int misc_init_r(void)
> +{
> +	uint8_t eeprom_enetaddr[6];
> +	uint8_t val[2];
> +
> +	if (!eth_getenv_enetaddr("ethaddr", eeprom_enetaddr)) {
> +		/* Read Ethernet MAC address from EEPROM if available. */
> +		if (dvevm_read_mac_address(eeprom_enetaddr))
> +			/* Set Ethernet MAC address from EEPROM */
> +			davinci_sync_env_enetaddr(eeprom_enetaddr);
> +	}
> +
> +	val[0] = 0x01;
> +	val[1] = 0x23;
> +
> +	if (i2c_write(PHY_SW_I2C_ADDR, 0, 0, val, 2))
> +		printf("Ethernet switch start failed!\n");
> +
> +}
> +

There is already code to do this, in the same file, in board_eth_init(). Why the new code?

Nick.

>  /*
>   * Initializes on-board ethernet controllers.
>   */
> diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
> index 66fdea2..a451513 100644
> --- a/include/configs/da830evm.h
> +++ b/include/configs/da830evm.h
> @@ -160,6 +160,7 @@
>  /*
>   * U-Boot general configuration
>   */
> +#define CONFIG_MISC_INIT_R
>  #undef CONFIG_USE_IRQ			/* No IRQ/FIQ in U-Boot */
>  #undef CONFIG_MISC_INIT_R
>  #undef CONFIG_BOOTDELAY
nagabhushana.netagunte@ti.com - Oct. 4, 2011, 1:50 p.m.
Hi Nick,
On Mon, Oct 03, 2011 at 17:31:05, Nick Thompson wrote:
> On 30/09/11 12:39, nagabhushana.netagunte@ti.com wrote:
> > From: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
> >
> > da830 boards have mac address stored in I2C EEPROM. This patch adds 
> > support to restore mac address from EEPROM if environment variable 
> > 'ethaddr' is not set.
> >
> > Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
> > Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
> > ---
> >  board/davinci/da8xxevm/da830evm.c |   20 ++++++++++++++++++++
> >  include/configs/da830evm.h        |    1 +
> >  2 files changed, 21 insertions(+), 0 deletions(-)
> >
> > diff --git a/board/davinci/da8xxevm/da830evm.c 
> > b/board/davinci/da8xxevm/da830evm.c
> > index 0650653..69ed293 100644
> > --- a/board/davinci/da8xxevm/da830evm.c
> > +++ b/board/davinci/da8xxevm/da830evm.c
> > @@ -188,6 +188,26 @@ int board_init(void)
> >  
> >  #define PHY_SW_I2C_ADDR	0x5f /* Address of PHY on i2c bus */
> >  
> > +int misc_init_r(void)
> > +{
> > +	uint8_t eeprom_enetaddr[6];
> > +	uint8_t val[2];
> > +
> > +	if (!eth_getenv_enetaddr("ethaddr", eeprom_enetaddr)) {
> > +		/* Read Ethernet MAC address from EEPROM if available. */
> > +		if (dvevm_read_mac_address(eeprom_enetaddr))
> > +			/* Set Ethernet MAC address from EEPROM */
> > +			davinci_sync_env_enetaddr(eeprom_enetaddr);
> > +	}
> > +
> > +	val[0] = 0x01;
> > +	val[1] = 0x23;
> > +
> > +	if (i2c_write(PHY_SW_I2C_ADDR, 0, 0, val, 2))
> > +		printf("Ethernet switch start failed!\n");
> > +
> > +}
> > +
> 
> There is already code to do this, in the same file, in board_eth_init(). Why the new code?
My bad. Will correct it.

Rgds,
Nag
> 
> Nick.
> 
> >  /*
> >   * Initializes on-board ethernet controllers.
> >   */
> > diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h 
> > index 66fdea2..a451513 100644
> > --- a/include/configs/da830evm.h
> > +++ b/include/configs/da830evm.h
> > @@ -160,6 +160,7 @@
> >  /*
> >   * U-Boot general configuration
> >   */
> > +#define CONFIG_MISC_INIT_R
> >  #undef CONFIG_USE_IRQ			/* No IRQ/FIQ in U-Boot */
> >  #undef CONFIG_MISC_INIT_R
> >  #undef CONFIG_BOOTDELAY
> 
>

Patch

diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c
index 0650653..69ed293 100644
--- a/board/davinci/da8xxevm/da830evm.c
+++ b/board/davinci/da8xxevm/da830evm.c
@@ -188,6 +188,26 @@  int board_init(void)
 
 #define PHY_SW_I2C_ADDR	0x5f /* Address of PHY on i2c bus */
 
+int misc_init_r(void)
+{
+	uint8_t eeprom_enetaddr[6];
+	uint8_t val[2];
+
+	if (!eth_getenv_enetaddr("ethaddr", eeprom_enetaddr)) {
+		/* Read Ethernet MAC address from EEPROM if available. */
+		if (dvevm_read_mac_address(eeprom_enetaddr))
+			/* Set Ethernet MAC address from EEPROM */
+			davinci_sync_env_enetaddr(eeprom_enetaddr);
+	}
+
+	val[0] = 0x01;
+	val[1] = 0x23;
+
+	if (i2c_write(PHY_SW_I2C_ADDR, 0, 0, val, 2))
+		printf("Ethernet switch start failed!\n");
+
+}
+
 /*
  * Initializes on-board ethernet controllers.
  */
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 66fdea2..a451513 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -160,6 +160,7 @@ 
 /*
  * U-Boot general configuration
  */
+#define CONFIG_MISC_INIT_R
 #undef CONFIG_USE_IRQ			/* No IRQ/FIQ in U-Boot */
 #undef CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY