From patchwork Tue Dec 9 23:03:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 42080 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD7CE244AC for ; Tue, 9 Dec 2014 23:13:56 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf1161398wgg.7 for ; Tue, 09 Dec 2014 15:13:56 -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=K6WbNgD/xgSw3qH0qVnJeS+A6zzjiE0BJH7xV6N89RU=; b=QTkz/F0g8paSvWZcqfc01hoXhZ6vd3Nx+PbDjnwLdkAEabxVGIithRNaJe1EuXGcHX Rz0z6rn6P6bHYh3XmArNqB1IV1kSWBP+imCfZBNZ6xD6m3f9NwK2IxG3l3F3hkp0OjCV 0m01ZyYhQQpZzfFZOqA0hYjgsJPJavG4PEG9ior8wZv6Mh5THgel5eW0jgl+FhG8Fk3X LDAJJRJm6qLi9xMEYI2dZ7DVTuie0SCTEIsxUYA+K+ugzIV7qu9Keqf7thoFdI6LB6xu 11fek270g3x66I6QYECZ/sc4c0rSBxaQ3ooYzsio2/qcCYmRBAojOivOs2uOcvyRuPsE IoZQ== X-Gm-Message-State: ALoCoQkV66Ho1l3aBa6aOYOKgKyKfnuma7Oja0DEtOoLxQ3vLGC+8WhQgcrFuimj3bAeVu3zRI1N X-Received: by 10.152.42.196 with SMTP id q4mr13937lal.6.1418166836021; Tue, 09 Dec 2014 15:13:56 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.33 with SMTP id lt1ls93823lac.64.gmail; Tue, 09 Dec 2014 15:13:55 -0800 (PST) X-Received: by 10.112.64.10 with SMTP id k10mr932323lbs.72.1418166835715; Tue, 09 Dec 2014 15:13:55 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id kl4si2718676lbc.134.2014.12.09.15.13.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Dec 2014 15:13:55 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ms9so1448426lab.10 for ; Tue, 09 Dec 2014 15:13:55 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr922935lbb.80.1418166835415; Tue, 09 Dec 2014 15:13:55 -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.184.201 with SMTP id ew9csp820075lbc; Tue, 9 Dec 2014 15:13:55 -0800 (PST) X-Received: by 10.194.81.38 with SMTP id w6mr1281471wjx.17.1418166834829; Tue, 09 Dec 2014 15:13:54 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id n2si17298750wic.45.2014.12.09.15.13.54 for ; Tue, 09 Dec 2014 15:13:54 -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 841784B683; Wed, 10 Dec 2014 00:13:53 +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 BhPieZ9bCfiC; Wed, 10 Dec 2014 00:13:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FF1F4B679; Wed, 10 Dec 2014 00:13:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 48F444B679 for ; Wed, 10 Dec 2014 00:13:47 +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 9XfB5yDHDtap for ; Wed, 10 Dec 2014 00:13:47 +0100 (CET) X-Greylist: delayed 579 seconds by postgrey-1.32 at theia; Wed, 10 Dec 2014 00:13:42 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 0AB064B66E for ; Wed, 10 Dec 2014 00:13:42 +0100 (CET) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADCC52011D; Tue, 9 Dec 2014 23:03:59 +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 D21C0200EC; Tue, 9 Dec 2014 23:03:58 +0000 (UTC) From: Kevin Hilman To: u-boot@lists.denx.de Date: Tue, 9 Dec 2014 15:03:58 -0800 Message-Id: <1418166238-21980-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 Subject: [U-Boot] [PATCH] 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.215.51 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 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()? */