diff options
| author | Michael Walle <michael@walle.cc> | 2021-02-25 16:51:11 +0100 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-06-18 11:29:17 +0300 |
| commit | 82a3c9ef20d43d97416589854b4bbcb4c2450c24 (patch) | |
| tree | a885f9b30eb15b9871b30c46280be4bb3b955b39 /test | |
| parent | 6e424b4acac0dba486a97ecd80a78aa0fea43683 (diff) | |
| download | u-boot-82a3c9ef20d43d97416589854b4bbcb4c2450c24.tar.gz | |
net: use the same alias stem for ethernet as linux
Linux uses the prefix "ethernet" whereas u-boot uses "eth". This is from
the linux tree:
$ grep "eth[0-9].*=.*&" arch/**/*dts{,i}|wc -l
0
$ grep "ethernet[0-9].*=.*&" arch/**/*dts{,i}|wc -l
633
In u-boot device trees both prefixes are used. Until recently the only
user of the ethernet alias was the sandbox test device tree. This
changed with commit fc054d563bfb ("net: Introduce DSA class for Ethernet
switches"). There, the MAC addresses are inherited based on the devices
sequence IDs which is in turn given by the device tree.
Before there are more users in u-boot and both worlds will differ even
more, rename the alias prefix to "ethernet" to match the linux ones.
Also adapt the test cases and rename any old aliases in the u-boot
device trees.
Cc: David Wu <david.wu@rock-chips.com>
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/ofnode.c | 2 | ||||
| -rw-r--r-- | test/dm/test-fdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index e0b525eeb1..de895773b5 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -213,7 +213,7 @@ static int dm_test_ofnode_read_aliases(struct unit_test_state *uts) ofnode node; int size; - node = ofnode_get_aliases_node("eth3"); + node = ofnode_get_aliases_node("ethernet3"); ut_assert(ofnode_valid(node)); ut_asserteq_str("sbe5", ofnode_get_name(node)); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index d273e21853..8866d4d959 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -183,7 +183,7 @@ static int dm_test_alias_highest_id(struct unit_test_state *uts) { int ret; - ret = dev_read_alias_highest_id("eth"); + ret = dev_read_alias_highest_id("ethernet"); ut_asserteq(5, ret); ret = dev_read_alias_highest_id("gpio"); |