From 674f35a88478cf6513285bbfbe8b820af43b828f Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 6 May 2026 14:34:10 +0200 Subject: [PATCH] powerpc: fix call to cpu_init_r Commit 6c171f7a184c ("common: board: make initcalls static") broke the call to cpu_init_r. That is because PPC is already defined to 1, see: powerpc-linux-gnu-gcc -dM -E - < /dev/null This will conflict with the CONFIG_IS_ENABLED(PPC). Change it to IS_ENABLED(CONFIG_PPC). Fixes: 6c171f7a184c ("common: board: make initcalls static") Signed-off-by: Michael Walle Signed-off-by: Peng Fan --- common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index ae686d18ae8..a397e20959d 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -687,7 +687,7 @@ static void initcall_run_r(void) INITCALL(initr_flash); #endif WATCHDOG_RESET(); -#if CONFIG_IS_ENABLED(PPC) || CONFIG_IS_ENABLED(M68K) || CONFIG_IS_ENABLED(X86) +#if IS_ENABLED(CONFIG_PPC) || CONFIG_IS_ENABLED(M68K) || CONFIG_IS_ENABLED(X86) /* initialize higher level parts of CPU like time base and timers */ INITCALL(cpu_init_r); #endif