From patchwork Fri Jul 5 08:40:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 257059 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 45A072C0090 for ; Fri, 5 Jul 2013 19:01:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 916D04A03B; Fri, 5 Jul 2013 11:01:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l1WGbveR9FtL; Fri, 5 Jul 2013 11:01:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5EEA64A03C; Fri, 5 Jul 2013 11:01:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7ACDE4A03C for ; Fri, 5 Jul 2013 11:01:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HZQXQCinwTbI for ; Fri, 5 Jul 2013 11:01:02 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pb0-f52.google.com (mail-pb0-f52.google.com [209.85.160.52]) by theia.denx.de (Postfix) with ESMTPS id 0FA864A03B for ; Fri, 5 Jul 2013 11:00:55 +0200 (CEST) Received: by mail-pb0-f52.google.com with SMTP id xa12so1946183pbc.39 for ; Fri, 05 Jul 2013 02:00:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=qduOoucRhqXefjh5rNMhrgc2mRFRPGkSJE6RtOP1ViU=; b=WWeLOmTbJMF+uwEtEDGmJ9ypySiNLyGy9WwXrK4h617D8DLe5XFSmySLc/MF5VmFv3 DI6Li1+vwSsFA7noRqaAxsumtZtTXhoS7iSERgGGyCCh9dm28qqRatVKtNYWUiP7Cu5z 3MLaLp4rQ5AbwxR7qHIs0PARwRRyz+vF4fa1niVEJG1JcLIuwaL+afOOOr37oEXUB27v Wp2QTKtBWkSVQujbZyN508tM/jjhQUJBj7uH/i7/p0WycLqxEK6Rvj4pAx8Q6o8B3CIU xmiWgk/PJDAX2ikHJOyiFLHuFOVTDwQVaZEMAHubfOYS5Eaq4XXMcErvPSawqtURPeci TG1Q== X-Received: by 10.66.2.164 with SMTP id 4mr10545908pav.55.1373014546019; Fri, 05 Jul 2013 01:55:46 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id v20sm7354378paj.4.2013.07.05.01.55.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Jul 2013 01:55:45 -0700 (PDT) From: Tushar Behera To: u-boot@lists.denx.de Date: Fri, 5 Jul 2013 14:10:20 +0530 Message-Id: <1373013620-13812-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnCwRFWaNPieIi58ZkIT9oF8davjN7XD7Y4Qgtp+f+mQBq/KZCb3TfIX3Ocd876dS4ZgBxQ Cc: patches@linaro.org Subject: [U-Boot] [PATCH] common: board_f: Fix build error when CONFIG_TRACE is not defined X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de When CONFIG_TRACE is not defined, definition of trace_early_init is not compiled and we get following error. common/libcommon.o:(.data.init_sequence_f+0xc): undefined reference to `trace_early_init' While at it, also define reserve_trace only if CONFIG_TRACE is defined. CC: Simon Glass Signed-off-by: Tushar Behera --- common/board_f.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index ab4242a..a685368 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -501,17 +501,17 @@ static int reserve_lcd(void) } #endif /* CONFIG_LCD */ +#ifdef CONFIG_TRACE static int reserve_trace(void) { -#ifdef CONFIG_TRACE gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); debug("Reserving %dk for trace data at: %08lx\n", CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); -#endif return 0; } +#endif #if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) \ && !defined(CONFIG_ARM) && !defined(CONFIG_X86) @@ -833,7 +833,9 @@ static init_fnc_t init_sequence_f[] = { #endif setup_mon_len, setup_fdt, +#ifdef CONFIG_TRACE trace_early_init, +#endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) /* TODO: can this go into arch_cpu_init()? */ probecpu, @@ -977,7 +979,9 @@ static init_fnc_t init_sequence_f[] = { #ifdef CONFIG_LCD reserve_lcd, #endif +#ifdef CONFIG_TRACE reserve_trace, +#endif /* TODO: Why the dependency on CONFIG_8xx? */ #if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) \ && !defined(CONFIG_ARM) && !defined(CONFIG_X86)