[U-Boot] [PATCH v2] common/board_f.c: fix compile error when tracing disabled

Kevin Hilman khilman at kernel.org
Mon Dec 15 20:31:00 CET 2014


From: Kevin Hilman <khilman at linaro.org>

When CONFIG_TRACE is disabled, linking fails with:

common/built-in.o:(.data.init_sequence_f+0x8): undefined reference to `trace_early_init'

To fix, wrap the call to trace_early_init() with #ifdef CONFIG_TRACE.

Cc: Simon Glass <sjg at chromium.org>
Cc: Tom Rini <trini at ti.com>
Signed-off-by: Kevin Hilman <khilman at linaro.org>
---
Applies to v2015.01-rc3

v2: Also remove the static inline stuff from trace.h

 common/board_f.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/board_f.c b/common/board_f.c
index 98c9c728ce73..cfd77f865361 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -813,7 +813,9 @@ static init_fnc_t init_sequence_f[] = {
 #endif
 	setup_mon_len,
 	setup_fdt,
+#ifdef CONFIG_TRACE
 	trace_early_init,
+#endif
 	initf_malloc,
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
 	/* TODO: can this go into arch_cpu_init()? */
-- 
2.1.3



More information about the U-Boot mailing list