mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-24 22:36:05 +00:00
sandbox: Move some mac addresses to device tree
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.anderson@seco.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
29186884f8
commit
e844e5d908
2 changed files with 4 additions and 4 deletions
|
@ -532,11 +532,13 @@
|
||||||
eth_5: eth@10003000 {
|
eth_5: eth@10003000 {
|
||||||
compatible = "sandbox,eth";
|
compatible = "sandbox,eth";
|
||||||
reg = <0x10003000 0x1000>;
|
reg = <0x10003000 0x1000>;
|
||||||
|
mac-address = [ 02 00 11 22 33 46 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
eth_3: sbe5 {
|
eth_3: sbe5 {
|
||||||
compatible = "sandbox,eth";
|
compatible = "sandbox,eth";
|
||||||
reg = <0x10005000 0x1000>;
|
reg = <0x10005000 0x1000>;
|
||||||
|
mac-address = [ 02 00 11 22 33 45 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
eth@10004000 {
|
eth@10004000 {
|
||||||
|
@ -547,6 +549,7 @@
|
||||||
phy_eth0: phy-test-eth {
|
phy_eth0: phy-test-eth {
|
||||||
compatible = "sandbox,eth";
|
compatible = "sandbox,eth";
|
||||||
reg = <0x10007000 0x1000>;
|
reg = <0x10007000 0x1000>;
|
||||||
|
mac-address = [ 02 00 11 22 33 49 ];
|
||||||
phy-handle = <ðphy1>;
|
phy-handle = <ðphy1>;
|
||||||
phy-mode = "2500base-x";
|
phy-mode = "2500base-x";
|
||||||
};
|
};
|
||||||
|
@ -554,6 +557,7 @@
|
||||||
dsa_eth0: dsa-test-eth {
|
dsa_eth0: dsa-test-eth {
|
||||||
compatible = "sandbox,eth";
|
compatible = "sandbox,eth";
|
||||||
reg = <0x10006000 0x1000>;
|
reg = <0x10006000 0x1000>;
|
||||||
|
mac-address = [ 02 00 11 22 33 48 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
dsa-test {
|
dsa-test {
|
||||||
|
|
|
@ -6,11 +6,7 @@ stdout=serial,vidconsole
|
||||||
stderr=serial,vidconsole
|
stderr=serial,vidconsole
|
||||||
|
|
||||||
ethaddr=02:00:11:22:33:44
|
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
|
eth6addr=02:00:11:22:33:47
|
||||||
eth8addr=02:00:11:22:33:49
|
|
||||||
ipaddr=192.0.2.1
|
ipaddr=192.0.2.1
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Reference in a new issue