We support up to 8 mac addresses in system eeprom, so we define the macro MAX_NUM_PORTS to limit the mac_count to 8, and update the number of ethxaddr according to mac_count.

Signed-off-by: Haiying Wang Haiying.Wang@freescale.com --- v2 change: define MAC_NUM_PORTS to limit the mac_count board/freescale/common/sys_eeprom.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 988cb94..671eb00 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 (yorksun@freescale.com) * Haiying Wang (haiying.wang@freescale.com) * Timur Tabi (timur@freescale.com) @@ -34,6 +34,8 @@ #error "Please define either CONFIG_SYS_I2C_EEPROM_CCID or CONFIG_SYS_I2C_EEPROM_NXID" #endif

+#define MAX_NUM_PORTS 8 + /** * static eeprom: EEPROM layout for CCID or NXID formats * @@ -119,7 +121,8 @@ static void show_eeprom(void) e.date[3] & 0x80 ? "PM" : "");

/* Show MAC addresses */ - for (i = 0; i < min(e.mac_count, 8); i++) { + for (i = 0; i < min(e.mac_count, MAX_NUM_PORTS); i++) { + u8 *p = e.mac[i];

printf("Eth%u: %02x:%02x:%02x:%02x:%02x:%02x\n", i, @@ -404,7 +407,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 MAX_NUM_PORTS */ + if (e.mac_count > MAX_NUM_PORTS) { + printf("Warning: The number of MAC address is greater" + " than MAX_NUM_PORTS, force it to MAX_NUM_PORTS.\n"); + e.mac_count = MAX_NUM_PORTS; + } + + 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];