From: Kevin Hilman <khilman@linaro.org>
Date: Mon, 15 Dec 2014 20:07:52 +0000 (-0800)
Subject: common/board_f.c: fix compile error when tracing disabled
X-Git-Tag: v2015.01~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9a325614469f82bec4d50a8f9dd0b6288c16be73;p=u-boot

common/board_f.c: fix compile error when tracing disabled

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 trace init calls with #ifdef CONFIG_TRACE.

While at it, remove the static inline version of the init call from
trace.h as suggested by Simon Glass, since it doesnt work.

Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/trace.h b/include/trace.h
index 871327fb35..09a38d782f 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -89,14 +89,7 @@ int trace_list_calls(void *buff, int buff_size, unsigned int *needed);
  */
 void trace_set_enabled(int enabled);
 
-#ifdef CONFIG_TRACE_EARLY
 int trace_early_init(void);
-#else
-static inline int trace_early_init(void)
-{
-	return 0;
-}
-#endif
 
 /**
  * Init the trace system