diff mbox

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

Message ID 1418166238-21980-1-git-send-email-khilman@kernel.org
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Kevin Hilman Dec. 9, 2014, 11:03 p.m. UTC 
From: Kevin Hilman <khilman@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@chromium.org>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
Applies to v2015.01-rc3

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

Comments

Simon Glass Dec. 10, 2014, 12:48 a.m. UTC | #1 
Hi Kevin,

On 9 December 2014 at 16:03, Kevin Hilman <khilman@kernel.org> wrote:
> From: Kevin Hilman <khilman@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@chromium.org>
> Cc: Tom Rini <trini@ti.com>
> Signed-off-by: Kevin Hilman <khilman@linaro.org>
> ---
> Applies to v2015.01-rc3
>
>  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()? */

Thanks - can you please also try removing the static inline stuff for
this in trace.h? It doesn't work.

Regards,
Simon
Tom Rini Dec. 30, 2014, 2:26 a.m. UTC | #2 
On Tue, Dec 09, 2014 at 03:03:58PM -0800, Kevin Hilman wrote:

> From: Kevin Hilman <khilman@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@chromium.org>
> Cc: Tom Rini <trini@ti.com>
> Signed-off-by: Kevin Hilman <khilman@linaro.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

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()? */