Hi,

On 09-07-16 15:05, Hans de Goede wrote:

Currently we will already fill ethaddr with a fixed unique address based on the SoCs serial (from the sid) to make sure that boards which use the integrated emac / gmac get a fixed mac rather then a random one.

On some boards (observed on 2 tablets using sdio rtl8703as wifi chips) the wifi does not come with a fixed mac either, so also set eth1addr, so that dts files can set an ethernet1 alias to get mac-address and local-mac-address filled for dt nodes describing the wifi controller.

Signed-off-by: Hans de Goede hdegoede@redhat.com

Oops, I forgot to update the commit msg and mark this as v2, I will send a new version instead.

Regards,

Hans

---

board/sunxi/board.c | 59 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 78dfda5..955a44f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -26,6 +26,7 @@ #endif #include <asm/gpio.h> #include <asm/io.h> +#include <libfdt.h> #include <nand.h> #include <net.h> #include <sy8106a.h> @@ -609,36 +610,38 @@ static void parse_spl_header(const uint32_t spl_addr) } #endif

-#ifdef CONFIG_MISC_INIT_R -int misc_init_r(void) +static void setup_environment(const void *fdt) { char serial_string[17] = { 0 }; unsigned int sid[4]; uint8_t mac_addr[6];

• int ret;

-#if !defined(CONFIG_SPL_BUILD)

• setenv("fel_booted", NULL);
• setenv("fel_scriptaddr", NULL);
• /* determine if we are running in FEL mode */
• if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */

• setenv("fel_booted", "1");
  

• parse_spl_header(SPL_ADDR);
  

• }

-#endif

• char ethaddr[16];

• int i, ret;

  ret = sunxi_get_sid(sid); if (ret == 0 && sid[0] != 0 && sid[3] != 0) {

• if (!getenv("ethaddr")) {
  

• for (i = 0; i < 4; i++) {
  

• 	sprintf(ethaddr, "ethernet%d", i);
  

• 	if (!fdt_get_alias(fdt, ethaddr))
  

• 		continue;
  

• 	if (i == 0)
  

• 		strcpy(ethaddr, "ethaddr");
  

• 	else
  

• 		sprintf(ethaddr, "eth%daddr", i);
  

• 	if (getenv(ethaddr))
  

• 		continue;
  

• /* Non OUI / registered MAC address */
  

• 	mac_addr[0] = 0x02;
  

• 	mac_addr[0] = (i << 4) | 0x02;
  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);
  

  }

  if (!getenv("serial#")) {

@@ -648,6 +651,24 @@ int misc_init_r(void) setenv("serial#", serial_string); } } +}

+#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{

• int ret;

+#if !defined(CONFIG_SPL_BUILD)

• setenv("fel_booted", NULL);
• setenv("fel_scriptaddr", NULL);
• /* determine if we are running in FEL mode */
• if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */

• setenv("fel_booted", "1");
  

• parse_spl_header(SPL_ADDR);
  

• }

+#endif

• setup_environment(gd->fdt_blob);

#ifndef CONFIG_MACH_SUN9I ret = sunxi_usb_phy_probe(); @@ -664,6 +685,12 @@ int ft_board_setup(void *blob, bd_t *bd) { int __maybe_unused r;

• /*

• * Call setup_environment again in case the boot fdt has
  

• * ethernet aliases the u-boot copy does not have.
  

• */
  

• setup_environment(blob);

#ifdef CONFIG_VIDEO_DT_SIMPLEFB r = sunxi_simplefb_setup(blob); if (r)