From: Simon Glass <sjg@chromium.org>
Date: Wed, 20 Nov 2024 15:36:39 +0000 (-0700)
Subject: common: Drop check for DM in initf_dm()
X-Git-Tag: v2025.04-rc1~32^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70c79dc88f9678653919c1d1545817876f1c0802;p=pandora-u-boot.git

common: Drop check for DM in initf_dm()

This is enabled by all boards, so drop the condition.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

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;
 }