From patchwork Mon Dec 15 19:31:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 42289 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3E12F26C6C for ; Mon, 15 Dec 2014 19:31:15 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf3982883wib.6 for ; Mon, 15 Dec 2014 11:31:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=dN0Eef7qoMCpw3Jlf0xHQxX43sGw8uE5JgdPxDm0eJw=; b=CngpApVj0rvkaPFLhTFh1iS098GMyzpHK/Q3kQMT2eWXFaSUX0HrwoYU1nb9YDAigM 8WHP7uqIz++OKok+gu2dtJJEg69FOzctwWIkiBaTJKOW8hU/PyJIFpqe/2RCBkfVzzS+ WlWyfXyZVEwH0aPw5VsMdR/XjotGWBNGjrlmXDCnIiks1vmo/67T1MGD+BhX2KbLa+Kf 83zxdoMCSi/BQt8+rUCeRcRzG8QEQFFb+N2xviS0rdfloWu1GaVQV+3MuLHUGHNRiuPh NoYz+wKN60P2OwNAJXPTxUbJSJd8ri3WBQHsvRwhVSEmCAqvSYvzyElkddeKS2U/cT1c y5Zg== X-Gm-Message-State: ALoCoQlKTzdewBv9HrWDLj6V3Rxv2XmBNw4VNNpowMLVlUd3bYRuEsk2Gqv4aMFphfVzYuRg6acG X-Received: by 10.180.108.101 with SMTP id hj5mr3088534wib.3.1418671874559; Mon, 15 Dec 2014 11:31:14 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.1 with SMTP id s1ls843242lal.23.gmail; Mon, 15 Dec 2014 11:31:14 -0800 (PST) X-Received: by 10.112.141.233 with SMTP id rr9mr32069384lbb.1.1418671874340; Mon, 15 Dec 2014 11:31:14 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id un3si11434632lbb.21.2014.12.15.11.31.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 11:31:14 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id w7so5485029lbi.16 for ; Mon, 15 Dec 2014 11:31:14 -0800 (PST) X-Received: by 10.152.23.38 with SMTP id j6mr24286431laf.81.1418671874052; Mon, 15 Dec 2014 11:31:14 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp818465lbb; Mon, 15 Dec 2014 11:31:12 -0800 (PST) X-Received: by 10.180.228.37 with SMTP id sf5mr34445939wic.35.1418671872727; Mon, 15 Dec 2014 11:31:12 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id l6si18359904wic.97.2014.12.15.11.31.12 for ; Mon, 15 Dec 2014 11:31:12 -0800 (PST) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13F864BA1B; Mon, 15 Dec 2014 20:31:11 +0100 (CET) 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 QALAiYfAmuMl; Mon, 15 Dec 2014 20:31:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82E724BA08; Mon, 15 Dec 2014 20:31:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65C374BA08 for ; Mon, 15 Dec 2014 20:31:06 +0100 (CET) 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 fKX7CePDaZpj for ; Mon, 15 Dec 2014 20:31:06 +0100 (CET) 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.kernel.org (mail.kernel.org [198.145.19.201]) by theia.denx.de (Postfix) with ESMTP id 204024BA04 for ; Mon, 15 Dec 2014 20:31:03 +0100 (CET) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 57502209E7; Mon, 15 Dec 2014 19:31:01 +0000 (UTC) Received: from localhost (c-67-160-101-93.hsd1.wa.comcast.net [67.160.101.93]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 78BBA209DD; Mon, 15 Dec 2014 19:31:00 +0000 (UTC) From: Kevin Hilman To: u-boot@lists.denx.de, Simon Glass Date: Mon, 15 Dec 2014 11:31:00 -0800 Message-Id: <1418671860-14396-1-git-send-email-khilman@kernel.org> X-Mailer: git-send-email 2.1.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: Tom Rini , linaro-kernel@lists.linaro.org Subject: [U-Boot] [PATCH v2] common/board_f.c: fix compile error when tracing disabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Kevin Hilman 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 Cc: Tom Rini Signed-off-by: Kevin Hilman --- 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()? */