diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-14 11:43:01 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-14 11:43:01 -0600 |
| commit | e17be5a07ad6947c13c39936be812a65e694ecee (patch) | |
| tree | 92f8addda6ee3a888101a736c1fb7c5e5d5f719c /common | |
| parent | 4eb937058ffd9d413929f566246eb684efe8eab5 (diff) | |
| parent | 6995f2c8be901b5f3f4183ccc4a58c209e8bce52 (diff) | |
Merge patch series "Adjust how autoprobe is implemented"
Simon Glass <sjg@chromium.org> says:
This little series makes a minor change to how autoprobe is
implemented, as discussed on the list.
Link: https://lore.kernel.org/r/20240626235717.272219-1-marex@denx.de
Link: https://lore.kernel.org/r/20241120153642.861633-1-sjg@chromium.org
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 9 | ||||
| -rw-r--r-- | common/board_r.c | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index 54c48d42ee9..6c5c3bfab48 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -815,21 +815,26 @@ static int initf_bootstage(void) static int initf_dm(void) { -#if defined(CONFIG_DM) && CONFIG_IS_ENABLED(SYS_MALLOC_F) int ret; + if (!CONFIG_IS_ENABLED(SYS_MALLOC_F)) + return 0; + 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; + if (IS_ENABLED(CONFIG_TIMER_EARLY)) { ret = dm_timer_init(); if (ret) return ret; } -#endif return 0; } diff --git a/common/board_r.c b/common/board_r.c index f63c6aed4d5..179259b00de 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -250,7 +250,7 @@ static int initr_dm(void) if (ret) return ret; - return 0; + return dm_autoprobe(); } #endif diff --git a/common/spl/spl.c b/common/spl/spl.c index ad31a2f8b6c..02269fff93c 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -500,6 +500,10 @@ static int spl_common_init(bool setup_malloc) debug("dm_init_and_scan() returned error %d\n", ret); return ret; } + + ret = dm_autoprobe(); + if (ret) + return ret; } return 0; |