From: Weijie Gao <weijie.gao@mediatek.com>
Date: Tue, 29 Apr 2025 02:04:24 +0000 (+0800)
Subject: common: board: fix build condition of noncached memory initcall
X-Git-Tag: v2025.07-rc2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6da395b5d68ad0e644e0a70665274dc60ec2056;p=pandora-u-boot.git

common: board: fix build condition of noncached memory initcall

CONFIG_SYS_NONCACHED_MEMORY is defined as hex, not bool. It should be
replaced with CONFIG_SYS_HAS_NONCACHED_MEMORY when switched from #ifdef to
CONFIG_IS_ENABLED().

Fixes: 6c171f7a184 (common: board: make initcalls static)
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Tested-by: Marcel Ziswiler <marcel.ziswiler@codethink.co.uk> # rock5b
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
---

diff --git a/common/board_r.c b/common/board_r.c
index bc6fd6448c2..b90a4d9ff69 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -639,7 +639,7 @@ static void initcall_run_r(void)
 #if CONFIG_IS_ENABLED(CONSOLE_RECORD)
 	INITCALL(console_record_init);
 #endif
-#if CONFIG_IS_ENABLED(SYS_NONCACHED_MEMORY)
+#if CONFIG_IS_ENABLED(SYS_HAS_NONCACHED_MEMORY)
 	INITCALL(noncached_init);
 #endif
 	INITCALL(initr_of_live);