From fb3fe58b586bf05c4c923dc4fc5cfc3e8a980d47 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 18 Mar 2015 17:23:40 -0600
Subject: [PATCH] SAMV7:  Add a sneak internal interface that will allow us to
 set the MAC address before NSH even starts

---
 arch/arm/src/samv7/sam_emac.c     | 72 ++++++++++++++++++++++++++++++-
 arch/arm/src/samv7/sam_ethernet.h | 36 +++++++++++++++-
 2 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index dff8402c18..8462d1ba9d 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -4909,7 +4909,8 @@ static int sam_emac_configure(struct sam_emac_s *priv)
  *   Initialize the EMAC driver.
  *
  * Input Parameters:
- *   None
+ *   intf - If multiple EMAC peripherals are supported, this identifies the
+ *     the EMAC peripheral being initialized.
  *
  * Returned Value:
  *   OK on success; Negated errno on failure.
@@ -5052,4 +5053,73 @@ errout:
   return ret;
 }
 
+/****************************************************************************
+ * Function: sam_emac_setmacaddr
+ *
+ * Description:
+ *   There are two ways that the Ethernet MAC address can be set:
+ *
+ *   1) Application level code can set the Ethernet MAC address using a
+ *      netdev ioctl.  The application level code have gotten the MAC
+ *      address from some configuration parameter or by accessing some
+ *      non-volatile storage containing the address.  This is the
+ *      "cannonically correct" way to set the MAC address.
+ *   2) Alterntively, the board logic may support some other less obvious
+ *      non-volatile storage and the board-level boot-up code may access
+ *      this and use this interface to set the Ethernet MAC address more
+ *      directly.  This is mostly a kludge for the case where you just don't
+ *      want to expose a application level storage interface.
+ *
+ * Input Parameters:
+ *   intf - If multiple EMAC peripherals are supported, this identifies the
+ *     the EMAC peripheral being initialized.
+ *
+ * Returned Value:
+ *   OK on success; Negated errno on failure.
+ *
+ * Assumptions:
+ *   Called very early in the initialization sequence.
+ *
+ ****************************************************************************/
+
+int sam_emac_setmacaddr(int intf, uint8_t mac[6])
+{
+  struct sam_emac_s *priv;
+  struct net_driver_s *dev;
+
+  /* Get the driver state structure */
+
+#if defined(CONFIG_SAMV7_EMAC0)
+  if (intf == EMAC0_INTF)
+    {
+      priv = &g_emac0;
+    }
+  else
+#endif
+#if defined(CONFIG_SAMV7_EMAC1)
+  if (intf == EMAC1_INTF)
+    {
+      priv = &g_emac1;
+    }
+  else
+#endif
+    {
+      ndbg("ERROR:  Interface %d not supported\n", intf);
+      return -EINVAL;
+    }
+
+  /* Copy the MAC address into the device structure */
+
+  dev = &priv->dev;
+  memcpy(dev->d_mac.ether_addr_octet, mac, 6);
+
+  nvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev->d_ifname,
+        dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
+        dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
+        dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
+
+  return OK;
+}
+
 #endif /* CONFIG_NET && CONFIG_SAMV7_EMAC */
diff --git a/arch/arm/src/samv7/sam_ethernet.h b/arch/arm/src/samv7/sam_ethernet.h
index 0772e0a8c2..f2d45a4bdb 100644
--- a/arch/arm/src/samv7/sam_ethernet.h
+++ b/arch/arm/src/samv7/sam_ethernet.h
@@ -187,7 +187,8 @@ extern "C"
  *   Initialize the EMAC driver.
  *
  * Input Parameters:
- *   None
+ *   intf - If multiple EMAC peripherals are supported, this identifies the
+ *     the EMAC peripheral being initialized.
  *
  * Returned Value:
  *   OK on success; Negated errno on failure.
@@ -201,6 +202,39 @@ extern "C"
 int sam_emac_initialize(int intf);
 #endif
 
+/****************************************************************************
+ * Function: sam_emac_setmacaddr
+ *
+ * Description:
+ *   There are two ways that the Ethernet MAC address can be set:
+ *
+ *   1) Application level code can set the Ethernet MAC address using a
+ *      netdev ioctl.  The application level code have gotten the MAC
+ *      address from some configuration parameter or by accessing some
+ *      non-volatile storage containing the address.  This is the
+ *      "cannonically correct" way to set the MAC address.
+ *   2) Alterntively, the board logic may support some other less obvious
+ *      non-volatile storage and the board-level boot-up code may access
+ *      this and use this interface to set the Ethernet MAC address more
+ *      directly.  This is mostly a kludge for the case where you just don't
+ *      want to expose a application level storage interface.
+ *
+ * Input Parameters:
+ *   intf - If multiple EMAC peripherals are supported, this identifies the
+ *     the EMAC peripheral being initialized.
+ *
+ * Returned Value:
+ *   OK on success; Negated errno on failure.
+ *
+ * Assumptions:
+ *   Called very early in the initialization sequence.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SAMV7_EMAC
+int sam_emac_setmacaddr(int intf, uint8_t mac[6]);
+#endif
+
 /************************************************************************************
  * Function: sam_phy_boardinitialize
  *