[PATCH v3 06/13] sandbox: Move some mac addresses to device tree

[Sean Anderson]

This prevents some conflicts when running sandbox with -D, since the
"rom" mac address will be random and won't match the environment. We
still need to keep addresses for eth1 and eth6 in the environment,
because dm_test_eth_rotate expects to be able to disable them by
removing their envaddr variables. This can likely be fixed in a future
series by adding a function to cause sandbox eth_opts callback for a
particular mac to fail immediately.

Signed-off-by: Sean Anderson <sean.ander...@seco.com>
Reviewed-by: Simon Glass <s...@chromium.org>
---

(no changes since v1)

 arch/sandbox/dts/test.dts | 4 ++++
 board/sandbox/sandbox.env | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 9c3a19f576..23a4e1f078 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -517,11 +517,13 @@
        eth_5: eth@10003000 {
                compatible = "sandbox,eth";
                reg = <0x10003000 0x1000>;
+               mac-address = [ 02 00 11 22 33 46 ];
        };
 
        eth_3: sbe5 {
                compatible = "sandbox,eth";
                reg = <0x10005000 0x1000>;
+               mac-address = [ 02 00 11 22 33 45 ];
        };
 
        eth@10004000 {
@@ -532,6 +534,7 @@
        phy_eth0: phy-test-eth {
                compatible = "sandbox,eth";
                reg = <0x10007000 0x1000>;
+               mac-address = [ 02 00 11 22 33 49 ];
                phy-handle = <&ethphy1>;
                phy-mode = "2500base-x";
        };
@@ -539,6 +542,7 @@
        dsa_eth0: dsa-test-eth {
                compatible = "sandbox,eth";
                reg = <0x10006000 0x1000>;
+               mac-address = [ 02 00 11 22 33 48 ];
        };
 
        dsa-test {
diff --git a/board/sandbox/sandbox.env b/board/sandbox/sandbox.env
index 88ed7a9606..a2c19702d6 100644
--- a/board/sandbox/sandbox.env
+++ b/board/sandbox/sandbox.env
@@ -6,11 +6,7 @@ stdout=serial,vidconsole
 stderr=serial,vidconsole
 
 ethaddr=02:00:11:22:33:44
-eth3addr=02:00:11:22:33:45
-eth4addr=02:00:11:22:33:48
-eth5addr=02:00:11:22:33:46
 eth6addr=02:00:11:22:33:47
-eth8addr=02:00:11:22:33:49
 ipaddr=192.0.2.1
 
 /*
-- 
2.35.1.1320.gc452695387.dirty