brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

net: eth-uclass: ignore unavailable devices

Browse Source 
device_probe() may fail in which case the seq_id will be -1. Don't
display these devices during startup. While this is only a cosmetic
change, the return value of eth_initialize() will also change to the
actual number of available devices. The return value is only used in
spl_net to decide whether there are any devices to boot from. So
returning only available devices is also more correct in that case.

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Michael Walle 2019-10-22 01:03:10 +02:00 committed by Joe Hershberger
parent bf58916373
commit 19820db0bd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/eth-uclass.c
View File

@ -420,20 +420,25 @@ int eth_initialize(void)
bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
do {
if (num_devices)
printf(", ");
if (dev->seq != -1) {
if (num_devices)
printf(", ");
printf("eth%d: %s", dev->seq, dev->name);
printf("eth%d: %s", dev->seq, dev->name);
if (ethprime && dev == prime_dev)
printf(" [PRIME]");
if (ethprime && dev == prime_dev)
printf(" [PRIME]");
}
eth_write_hwaddr(dev);
if (dev->seq != -1)
num_devices++;
uclass_next_device_check(&dev);
num_devices++;
} while (dev);
if (!num_devices)
printf("No ethernet found.\n");
putc('\n');
}