* [U-Boot] [PATCH 0/1] Davinci: Make MAC address offset in EEPROM configurable
@ 2013-02-01 7:18 Kim Bøndergaard
2013-02-01 7:18 ` [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET Kim Bøndergaard
0 siblings, 1 reply; 4+ messages in thread
From: Kim Bøndergaard @ 2013-02-01 7:18 UTC (permalink / raw)
To: u-boot
Like subjects say, offset of MAC adress in EEPROM changed from hardcoded value to
a per board configurable value
The following changes since commit 79af5f82d78b8bbc5fe81302b8a4b7fb5d880f25:
Davinci: Fix, console output confusing while setting MAC address (2013-02-01 07:04:12 +0000)
are available in the git repository at:
git://gitorious.org/~kibo/u-boot-shr/kibos-u-boot kibo-master
http://gitorious.org/~kibo/u-boot-shr/kibos-u-boot/commits/kibo-master
Kim B?ndergaard (1):
Davinci: Make MAC address offset in EEPROM configurable
CONFIG_SYS_I2C_EEPROM_MAC_OFFSET
arch/arm/cpu/arm926ejs/davinci/misc.c | 2 +-
include/configs/da830evm.h | 1 +
include/configs/davinci_dm365evm.h | 1 +
include/configs/davinci_dm6467evm.h | 1 +
include/configs/davinci_dvevm.h | 1 +
include/configs/davinci_sffsdr.h | 1 +
include/configs/davinci_sonata.h | 1 +
7 files changed, 7 insertions(+), 1 deletion(-)
--
1.8.0.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET
2013-02-01 7:18 [U-Boot] [PATCH 0/1] Davinci: Make MAC address offset in EEPROM configurable Kim Bøndergaard
@ 2013-02-01 7:18 ` Kim Bøndergaard
2013-02-18 18:39 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Kim Bøndergaard @ 2013-02-01 7:18 UTC (permalink / raw)
To: u-boot
---
arch/arm/cpu/arm926ejs/davinci/misc.c | 2 +-
include/configs/da830evm.h | 1 +
include/configs/davinci_dm365evm.h | 1 +
include/configs/davinci_dm6467evm.h | 1 +
include/configs/davinci_dvevm.h | 1 +
include/configs/davinci_sffsdr.h | 1 +
include/configs/davinci_sonata.h | 1 +
7 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/arm926ejs/davinci/misc.c b/arch/arm/cpu/arm926ejs/davinci/misc.c
index 7e5728c..3e82d9a 100644
--- a/arch/arm/cpu/arm926ejs/davinci/misc.c
+++ b/arch/arm/cpu/arm926ejs/davinci/misc.c
@@ -59,7 +59,7 @@ int dvevm_read_mac_address(uint8_t *buf)
{
#ifdef CONFIG_SYS_I2C_EEPROM_ADDR
/* Read MAC address. */
- if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00,
+ if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, CONFIG_SYS_I2C_EEPROM_MAC_OFFSET,
CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (uint8_t *) &buf[0], 6))
goto i2cerr;
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index f7ac256..2fa4a79 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -80,6 +80,7 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/*
* Network & Ethernet Configuration
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 6a331aa..72ec862 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -53,6 +53,7 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/* Network Configuration */
#define CONFIG_DRIVER_TI_EMAC
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 366c77f..93da788 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -48,6 +48,7 @@ extern unsigned int davinci_arm_clk_get(void);
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/* Memory Info */
#define CONFIG_SYS_MALLOC_LEN (1 << 20) /* 1 MiB */
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index ab9cedd..c7917b4 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -67,6 +67,7 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/*=============*/
/* Memory Info */
/*=============*/
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 958b19a..d150f9e 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -39,6 +39,7 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 5
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/* Memory Info */
#define CONFIG_SYS_MALLOC_LEN (0x10000 + 256*1024) /* malloc() len */
#define CONFIG_SYS_MEMTEST_START 0x80000000 /* memtest start address */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 3d8d392..fdec085 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -69,6 +69,7 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20
+#define CONFIG_SYS_I2C_EEPROM_MAC_OFFSET 0x7F00
/*=============*/
/* Memory Info */
/*=============*/
--
1.8.0.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET
2013-02-01 7:18 ` [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET Kim Bøndergaard
@ 2013-02-18 18:39 ` Tom Rini
2013-02-18 18:47 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Tom Rini @ 2013-02-18 18:39 UTC (permalink / raw)
To: u-boot
On Fri, Feb 01, 2013 at 07:18:58AM +0000, Kim B??ndergaard wrote:
> ---
> arch/arm/cpu/arm926ejs/davinci/misc.c | 2 +-
> include/configs/da830evm.h | 1 +
> include/configs/davinci_dm365evm.h | 1 +
> include/configs/davinci_dm6467evm.h | 1 +
> include/configs/davinci_dvevm.h | 1 +
> include/configs/davinci_sffsdr.h | 1 +
> include/configs/davinci_sonata.h | 1 +
> 7 files changed, 7 insertions(+), 1 deletion(-)
With the following addition to fix da850_am18xxevm:
diff --git a/boards.cfg b/boards.cfg
index b1319aa..e89762b 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -137,7 +137,7 @@ portuxg20 arm arm926ejs stamp9g20 taskit
stamp9g20 arm arm926ejs stamp9g20 taskit at91 stamp9g20:AT91SAM9G20
cam_enc_4xx arm arm926ejs cam_enc_4xx ait davinci cam_enc_4xx
da830evm arm arm926ejs da8xxevm davinci davinci
-da850_am18xxevm arm arm926ejs da8xxevm davinci davinci da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
+da850_am18xxevm arm arm926ejs da8xxevm davinci davinci da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50,SYS_I2C_EEPROM_MAC_OFFSET=0x7F00
da850evm arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH
da850evm_direct_nor arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT
davinci_dm355evm arm arm926ejs dm355evm davinci davinci
Applied to u-boot-ti/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130218/ea10aaad/attachment.pgp>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET
2013-02-18 18:39 ` Tom Rini
@ 2013-02-18 18:47 ` Tom Rini
0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2013-02-18 18:47 UTC (permalink / raw)
To: u-boot
On Mon, Feb 18, 2013 at 01:39:45PM -0500, Tom Rini wrote:
> On Fri, Feb 01, 2013 at 07:18:58AM +0000, Kim B??ndergaard wrote:
>
> > ---
> > arch/arm/cpu/arm926ejs/davinci/misc.c | 2 +-
> > include/configs/da830evm.h | 1 +
> > include/configs/davinci_dm365evm.h | 1 +
> > include/configs/davinci_dm6467evm.h | 1 +
> > include/configs/davinci_dvevm.h | 1 +
> > include/configs/davinci_sffsdr.h | 1 +
> > include/configs/davinci_sonata.h | 1 +
> > 7 files changed, 7 insertions(+), 1 deletion(-)
>
> With the following addition to fix da850_am18xxevm:
>
> diff --git a/boards.cfg b/boards.cfg
> index b1319aa..e89762b 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -137,7 +137,7 @@ portuxg20 arm arm926ejs stamp9g20 taskit
> stamp9g20 arm arm926ejs stamp9g20 taskit at91 stamp9g20:AT91SAM9G20
> cam_enc_4xx arm arm926ejs cam_enc_4xx ait davinci cam_enc_4xx
> da830evm arm arm926ejs da8xxevm davinci davinci
> -da850_am18xxevm arm arm926ejs da8xxevm davinci davinci da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
> +da850_am18xxevm arm arm926ejs da8xxevm davinci davinci da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50,SYS_I2C_EEPROM_MAC_OFFSET=0x7F00
> da850evm arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH
> da850evm_direct_nor arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT
> davinci_dm355evm arm arm926ejs dm355evm davinci davinci
>
> Applied to u-boot-ti/master, thanks!
Blarg, I take it back. It's not applied as I see you didn't include a
Signed-off-by line. Please incorporate the above change which is:
Signed-off-by: Tom Rini <trini@ti.com>
and submit a v3, assuming the rules for a Signed-off-by-line are true.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130218/253b6bf4/attachment.pgp>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-18 18:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-01 7:18 [U-Boot] [PATCH 0/1] Davinci: Make MAC address offset in EEPROM configurable Kim Bøndergaard
2013-02-01 7:18 ` [U-Boot] [PATCH 1/1] Davinci: Make MAC address offset in EEPROM configurable CONFIG_SYS_I2C_EEPROM_MAC_OFFSET Kim Bøndergaard
2013-02-18 18:39 ` Tom Rini
2013-02-18 18:47 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox