diff --git a/common/board_f.c b/common/board_f.c
index 55ede07537cc8b15a3851c3ff58610c3c2e723db..e537cd1ff8c13e17709d1fe1d422b6e286c47e82 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -1080,7 +1080,9 @@ void board_init_f_r(void)
 	/* NOTREACHED - board_init_r() does not return */
 	hang();
 }
-#else
+#endif /* CONFIG_X86 */
+
+#ifndef CONFIG_X86
 ulong board_init_f_mem(ulong top)
 {
 	/* Leave space for the stack we are running with now */
@@ -1098,4 +1100,4 @@ ulong board_init_f_mem(ulong top)
 
 	return top;
 }
-#endif /* CONFIG_X86 */
+#endif /* !CONFIG_X86 */