From 70c79dc88f9678653919c1d1545817876f1c0802 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 20 Nov 2024 08:36:39 -0700 Subject: [PATCH] common: Drop check for DM in initf_dm() This is enabled by all boards, so drop the condition. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/board_f.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 54c48d42ee9..d2c24d418fb 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -815,9 +815,11 @@ 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); @@ -829,7 +831,6 @@ static int initf_dm(void) if (ret) return ret; } -#endif return 0; } -- 2.39.5