From: Tom Rini <trini@konsulko.com>
Date: Tue, 11 Mar 2025 00:12:27 +0000 (-0600)
Subject: Merge tag 'v2025.04-rc4' into next
X-Git-Tag: v2025.07-rc1~18^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b42f57ec82ceba4d5f08cfb359717232301cfa5;p=pandora-u-boot.git

Merge tag 'v2025.04-rc4' into next

This uses Heinrich's merge of lib/efi_loader/efi_net.c which results in
no changes.
---

1b42f57ec82ceba4d5f08cfb359717232301cfa5
diff --cc common/miiphyutil.c
index 2a034d3a77c,6169ea884ae..3d960c259b5
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@@ -55,24 -55,6 +55,14 @@@ struct mii_dev *miiphy_get_dev_by_name(
  	return NULL;
  }
  
- /*****************************************************************************
-  *
-  * Initialize global data. Need to be called before any other miiphy routine.
-  */
- void miiphy_init(void)
- {
- 	INIT_LIST_HEAD(&mii_devs);
- 	current_mii = NULL;
- }
- 
 +void mdio_init(struct mii_dev *bus)
 +{
 +	memset(bus, 0, sizeof(*bus));
 +
 +	/* initialize mii_dev struct fields */
 +	INIT_LIST_HEAD(&bus->link);
 +}
 +
  struct mii_dev *mdio_alloc(void)
  {
  	struct mii_dev *bus;