diff options
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 19 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/cpu.h | 1 | ||||
| -rw-r--r-- | board/sunxi/board.c | 24 |
3 files changed, 31 insertions, 13 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index 5146dc422f..7a3a4ca81b 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -10,6 +10,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> +#include <axp221.h> #ifdef CONFIG_MACH_SUN6I int sunxi_get_ss_bonding_id(void) @@ -72,3 +73,21 @@ int print_cpuinfo(void) return 0; } #endif + +int sunxi_get_sid(unsigned int *sid) +{ +#ifdef CONFIG_MACH_SUN6I +#ifdef CONFIG_AXP221_POWER + return axp221_get_sid(sid); +#else + return -ENODEV; +#endif +#else + int i; + + for (i = 0; i< 4; i++) + sid[i] = readl(SUNXI_SID_BASE + 4 * i); + + return 0; +#endif +} diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h index 8aeed2fc72..9500262ca9 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -147,6 +147,7 @@ void sunxi_board_init(void); void sunxi_reset(void); int sunxi_get_ss_bonding_id(void); +int sunxi_get_sid(unsigned int *sid); #endif /* __ASSEMBLY__ */ #endif /* _CPU_H */ diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 4c1c69a6ae..b5dfe958ad 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -217,22 +217,20 @@ void sunxi_board_init(void) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { - if (!getenv("ethaddr")) { - uint32_t reg_val = readl(SUNXI_SID_BASE); + unsigned int sid[4]; - if (reg_val) { - uint8_t mac_addr[6]; + if (!getenv("ethaddr") && sunxi_get_sid(sid) == 0 && + sid[0] != 0 && sid[3] != 0) { + uint8_t mac_addr[6]; - mac_addr[0] = 0x02; /* Non OUI / registered MAC address */ - mac_addr[1] = (reg_val >> 0) & 0xff; - reg_val = readl(SUNXI_SID_BASE + 0x0c); - mac_addr[2] = (reg_val >> 24) & 0xff; - mac_addr[3] = (reg_val >> 16) & 0xff; - mac_addr[4] = (reg_val >> 8) & 0xff; - mac_addr[5] = (reg_val >> 0) & 0xff; + mac_addr[0] = 0x02; /* Non OUI / registered MAC address */ + mac_addr[1] = (sid[0] >> 0) & 0xff; + mac_addr[2] = (sid[3] >> 24) & 0xff; + mac_addr[3] = (sid[3] >> 16) & 0xff; + mac_addr[4] = (sid[3] >> 8) & 0xff; + mac_addr[5] = (sid[3] >> 0) & 0xff; - eth_setenv_enetaddr("ethaddr", mac_addr); - } + eth_setenv_enetaddr("ethaddr", mac_addr); } return 0; |