Merge tag 'v2025.04-rc4' into next
authorTom Rini <trini@konsulko.com>
Tue, 11 Mar 2025 00:12:27 +0000 (18:12 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 11 Mar 2025 02:18:51 +0000 (20:18 -0600)
This uses Heinrich's merge of lib/efi_loader/efi_net.c which results in
no changes.

1  2 
MAINTAINERS
Makefile
cmd/Kconfig
common/board_f.c
common/miiphyutil.c
include/miiphy.h
tools/binman/ftest.py

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc cmd/Kconfig
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge