env: Move env_set() to env.h

[oweals/u-boot.git] / drivers / net / sandbox-raw.c

diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 591242797e26dfff301888f1022f62ce8fa5f88d..3707ee35eb5c4a4c55fa26017fe41380fe6c801d 100644 (file)
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -1,15 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 National Instruments
  *
  * (C) Copyright 2015
  * Joe Hershberger <joe.hershberger@ni.com>
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <asm/eth-raw-os.h>
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <malloc.h>
 #include <net.h>
 
@@ -22,21 +22,18 @@ static int sb_eth_raw_start(struct udevice *dev)
 {
        struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
        struct eth_pdata *pdata = dev_get_platdata(dev);
-       const char *interface;
+       int ret;
 
        debug("eth_sandbox_raw: Start\n");
 
-       interface = fdt_getprop(gd->fdt_blob, dev->of_offset,
-                                           "host-raw-interface", NULL);
-       if (interface == NULL)
-               return -EINVAL;
-
-       if (strcmp(interface, "lo") == 0) {
-               priv->local = 1;
-               setenv("ipaddr", "127.0.0.1");
-               setenv("serverip", "127.0.0.1");
+       ret = sandbox_eth_raw_os_start(priv, pdata->enetaddr);
+       if (priv->local) {
+               env_set("ipaddr", "127.0.0.1");
+               env_set("serverip", "127.0.0.1");
+               net_ip = string_to_ip("127.0.0.1");
+               net_server_ip = net_ip;
        }
-       return sandbox_eth_raw_os_start(interface, pdata->enetaddr, priv);
+       return ret;
 }
 
 static int sb_eth_raw_send(struct udevice *dev, void *packet, int length)
@@ -134,18 +131,53 @@ static void sb_eth_raw_stop(struct udevice *dev)
        sandbox_eth_raw_os_stop(priv);
 }
 
+static int sb_eth_raw_read_rom_hwaddr(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+
+       net_random_ethaddr(pdata->enetaddr);
+
+       return 0;
+}
+
 static const struct eth_ops sb_eth_raw_ops = {
        .start                  = sb_eth_raw_start,
        .send                   = sb_eth_raw_send,
        .recv                   = sb_eth_raw_recv,
        .stop                   = sb_eth_raw_stop,
+       .read_rom_hwaddr        = sb_eth_raw_read_rom_hwaddr,
 };
 
 static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev)
 {
        struct eth_pdata *pdata = dev_get_platdata(dev);
+       struct eth_sandbox_raw_priv *priv = dev_get_priv(dev);
+       const char *ifname;
+       int ret;
+
+       pdata->iobase = dev_read_addr(dev);
+
+       ifname = dev_read_string(dev, "host-raw-interface");
+       if (ifname) {
+               strncpy(priv->host_ifname, ifname, IFNAMSIZ);
+               printf(": Using %s from DT\n", priv->host_ifname);
+       }
+       if (dev_read_u32(dev, "host-raw-interface-idx",
+                        &priv->host_ifindex) < 0) {
+               priv->host_ifindex = 0;
+       } else {
+               ret = sandbox_eth_raw_os_idx_to_name(priv);
+               if (ret < 0)
+                       return ret;
+               printf(": Using interface index %d from DT (%s)\n",
+                      priv->host_ifindex, priv->host_ifname);
+       }
+
+       ret = sandbox_eth_raw_os_is_local(priv->host_ifname);
+       if (ret < 0)
+               return ret;
+       priv->local = ret;
 
-       pdata->iobase = dev_get_addr(dev);
        return 0;
 }