Signed-off-by: Vipin vipin.kumar@st.com --- board/spear/common/spr_misc.c | 70 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/board/spear/common/spr_misc.c b/board/spear/common/spr_misc.c index 3fbeba7..c4e3a1a 100755 --- a/board/spear/common/spr_misc.c +++ b/board/spear/common/spr_misc.c @@ -62,6 +62,13 @@ int dram_init(void)
int misc_init_r(void) { +#if defined(CONFIG_CMD_NET) + uchar mac_id[6]; + + if (!eth_getenv_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id)) { + eth_setenv_enetaddr("ethaddr", mac_id); + } +#endif setenv("verify", "n"); return 0; } @@ -90,6 +97,46 @@ int spear_board_init(ulong mach_type) return 0; }
+static int i2c_read_mac(uchar *buffer) +{ + u8 buf[2]; + + i2c_read(0x50, 0x0, 1, buf, 2); + + /* Check if mac in i2c memory is valid */ + if ((buf[0] == 0x55) && (buf[1] == 0xAA)) { + /* Valid mac address is saved in i2c eeprom */ + i2c_read(0x50, 0x2, 1, buffer, 6); + return 0; + } + + return -1; +} + +static int write_mac(uchar *mac) +{ + unsigned char buf[2]; + + buf[0] = 0x55; + buf[1] = 0xAA; + i2c_write(0x50, 0x0, 1, buf, 2); + + buf[0] = 0x44; + buf[1] = 0x66; + + i2c_read(0x50, 0x0, 1, buf, 2); + + /* check if valid MAC address is saved in I2C EEPROM or not? */ + if ((buf[0] == 0x55) && (buf[1] == 0xAA)) { + i2c_write(0x50, 0x2, 1, mac, 6); + puts("I2C EEPROM written with mac address \n"); + return 0; + } + + puts("I2C EEPROM writing failed \n"); + return -1; +} + #define CPU 0 #define DDR 1
@@ -97,7 +144,10 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { void (*sram_setfreq) (unsigned int, unsigned int); struct chip_data *chip = &chip_data; - unsigned int frequency; + unsigned char mac[6]; + unsigned int reg, frequency; + char *s, *e; + char i2c_mac[20];
if ((argc > 3) || (argc < 2)) { cmd_usage(cmdtp); @@ -128,6 +178,17 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) }
return 0; + } else if (!strcmp(argv[1], "ethaddr")) { + + s = argv[2]; + for (reg = 0; reg < 6; ++reg) { + mac[reg] = s ? simple_strtoul(s, &e, 16) : 0; + if (s) + s = (*e) ? e + 1 : e; + } + write_mac(mac); + + return 0; } else if (!strcmp(argv[1], "display")) {
if (chip->cpufreq == -1) @@ -147,6 +208,13 @@ int do_chip_config(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) else printf("DDR Type = Not Known\n");
+ if (!i2c_read_mac(mac)) { + sprintf(i2c_mac, "%pM", mac); + printf("Ethaddr (from i2c mem) = %s\n", i2c_mac); + } else { + printf("Ethaddr (from i2c mem) = Not set\n"); + } + printf("Xloader Rev = %s\n", chip->version);
return 0;