[U-Boot] [PATCH 10/15] Update the number of ethxaddr in reading system eeprom

2009-05-20 Thread Haiying Wang 
We support up to 8 mac addresses in system eeprom, so we'd limit the mac_count
to 8, and update the number of ethxaddr if there is more than 4 ethernet ports.

Signed-off-by: Haiying Wang haiying.w...@freescale.com
---
 board/freescale/common/sys_eeprom.c |   11 +--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/board/freescale/common/sys_eeprom.c 
b/board/freescale/common/sys_eeprom.c
index 988cb94..d71a5e4 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, 2008 Freescale Semiconductor
+ * Copyright 2006, 2008-2009 Freescale Semiconductor
  * York Sun (york...@freescale.com)
  * Haiying Wang (haiying.w...@freescale.com)
  * Timur Tabi (ti...@freescale.com)
@@ -404,7 +404,14 @@ int mac_read_from_eeprom(void)
}
}
 
-   for (i = 0; i  min(4, e.mac_count); i++) {
+   /* Check the number of MAC address which is limited to 8 */
+   if (e.mac_count  8) {
+   printf(Warning: The number of MAC address is greater
+than 8, force it to 8.\n);
+   e.mac_count = 8;
+   }
+
+   for (i = 0; i  e.mac_count; i++) {
if (memcmp(e.mac[i], \0\0\0\0\0\0, 6) 
memcmp(e.mac[i], \xFF\xFF\xFF\xFF\xFF\xFF, 6)) {
char ethaddr[18];
-- 
1.6.0.2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 10/15] Update the number of ethxaddr in reading system eeprom

2009-05-20 Thread Wolfgang Denk 
Dear Haiying Wang,

In message 1242837043-8243-10-git-send-email-haiying.w...@freescale.com you 
wrote:
 We support up to 8 mac addresses in system eeprom, so we'd limit the mac_count
 to 8, and update the number of ethxaddr if there is more than 4 ethernet 
 ports.
 
 Signed-off-by: Haiying Wang haiying.w...@freescale.com
 ---
  board/freescale/common/sys_eeprom.c |   11 +--
  1 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/board/freescale/common/sys_eeprom.c 
 b/board/freescale/common/sys_eeprom.c
 index 988cb94..d71a5e4 100644
 --- a/board/freescale/common/sys_eeprom.c
 +++ b/board/freescale/common/sys_eeprom.c
 @@ -1,5 +1,5 @@
  /*
 - * Copyright 2006, 2008 Freescale Semiconductor
 + * Copyright 2006, 2008-2009 Freescale Semiconductor
   * York Sun (york...@freescale.com)
   * Haiying Wang (haiying.w...@freescale.com)
   * Timur Tabi (ti...@freescale.com)
 @@ -404,7 +404,14 @@ int mac_read_from_eeprom(void)
   }
   }
  
 - for (i = 0; i  min(4, e.mac_count); i++) {
 + /* Check the number of MAC address which is limited to 8 */
 + if (e.mac_count  8) {
 + printf(Warning: The number of MAC address is greater
 +  than 8, force it to 8.\n);
 + e.mac_count = 8;
 + }

Instead of repeatedly using the magic number 8 here, this should be a
#define in som eheader file.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
If you're not part of the solution, then you're part of the  precipi-
tate.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot