diff options
| author | Tom Rini <[email protected]> | 2025-03-10 18:12:27 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-10 20:18:51 -0600 |
| commit | 1b42f57ec82ceba4d5f08cfb359717232301cfa5 (patch) | |
| tree | 31d06c51e893855c3f52c0aa9bc9330b17376374 /common | |
| parent | 124b75644cf4a9b381746f6deed1472e7915b9f1 (diff) | |
| parent | a383b9bd4d7e430fe7c254297540bae596649dba (diff) | |
Merge tag 'v2025.04-rc4' into next
This uses Heinrich's merge of lib/efi_loader/efi_net.c which results in
no changes.
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/miiphyutil.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/common/board_f.c b/common/board_f.c index 2912320054f..baf98fb8ec8 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -828,13 +828,13 @@ static int initf_dm(void) bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f"); ret = dm_init_and_scan(true); - bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (ret) return ret; ret = dm_autoprobe(); if (ret) return ret; + bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (IS_ENABLED(CONFIG_TIMER_EARLY)) { ret = dm_timer_init(); diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 2a034d3a77c..3d960c259b5 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -30,7 +30,7 @@ #define debug(fmt, args...) #endif /* MII_DEBUG */ -static struct list_head mii_devs; +static LIST_HEAD(mii_devs); static struct mii_dev *current_mii; /* @@ -55,16 +55,6 @@ struct mii_dev *miiphy_get_dev_by_name(const char *devname) 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)); |