From patchwork Tue Oct 20 06:05:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 55273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f72.google.com (mail-lf0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 6EFFF22F11 for ; Tue, 20 Oct 2015 06:05:56 +0000 (UTC) Received: by lffv3 with SMTP id v3sf323489lff.1 for ; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) 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:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=ENdrSV9GklIxOa79LHLCMpr0vXjsMcEhf4HJixqRvLc=; b=QfRsec9o4BklFQUFz5S+o5Ujfg+suKpoV3rr6PtzqY+X7C9b1JBoiGSrL+B+b/yXwY KVrMvc4GPbUfBDjlwJprGI5iE+UJ3MtJ2LUgh0VochlG5y9ryrGpy8gv24OBjJmulWsY V6zzLP58rLVT/682OztT9Vplm/03Dkx5lmtEmz37uZCrTtCbRNsonObLUZcVVKuBTgKH Dp2T2ybrXgF+3rT1/ND4C4HuxUJkx5wajaZjooU6u34Dg3kEcQENMvB+GYxIWmgwpblU Bkk3DL5aEvHqXA0ymf5NI5FHPuorPbhijHj2pzcQAVdFk8QsDOddqYDSnXDbQXm3ClSj lg5A== X-Gm-Message-State: ALoCoQk1g1lRpCbbU2BdHL5ykVnOkxo09yJYNQBW+0YuWo7iuTHnQCT9A9eQ0rda5D4mEiiek3wC X-Received: by 10.112.63.165 with SMTP id h5mr239142lbs.18.1445321155423; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.27.206 with SMTP id b197ls23656lfb.26.gmail; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) X-Received: by 10.112.148.38 with SMTP id tp6mr660382lbb.110.1445321155275; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id oj2si1010368lbb.154.2015.10.19.23.05.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 23:05:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lfaz124 with SMTP id z124so353403lfa.1 for ; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) X-Received: by 10.25.20.24 with SMTP id k24mr415637lfi.117.1445321155132; Mon, 19 Oct 2015 23:05:55 -0700 (PDT) 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.59.35 with SMTP id w3csp1874521lbq; Mon, 19 Oct 2015 23:05:54 -0700 (PDT) X-Received: by 10.194.172.228 with SMTP id bf4mr1610181wjc.80.1445321154484; Mon, 19 Oct 2015 23:05:54 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id v8si27006574wiz.88.2015.10.19.23.05.54; Mon, 19 Oct 2015 23:05:54 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 722EE4B635; Tue, 20 Oct 2015 08:05:53 +0200 (CEST) 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 Nzni_OjMUYjU; Tue, 20 Oct 2015 08:05:52 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 482B04B62A; Tue, 20 Oct 2015 08:05:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEB9F4B62A for ; Tue, 20 Oct 2015 08:05:49 +0200 (CEST) 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 4Qh3gtOIRSYm for ; Tue, 20 Oct 2015 08:05:49 +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-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by theia.denx.de (Postfix) with ESMTPS id 3F30C4B624 for ; Tue, 20 Oct 2015 08:05:46 +0200 (CEST) Received: by lbcao8 with SMTP id ao8so7170868lbc.3 for ; Mon, 19 Oct 2015 23:05:45 -0700 (PDT) X-Received: by 10.112.138.37 with SMTP id qn5mr659229lbb.52.1445321145458; Mon, 19 Oct 2015 23:05:45 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id g140sm226248lfg.29.2015.10.19.23.05.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 23:05:44 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 20 Oct 2015 08:05:40 +0200 Message-Id: <1445321140-28976-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Cc: u-boot-review@google.com Subject: [U-Boot] [PATCH] vexpress64: compile Juno PCIe conditionally X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@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.46 as permitted sender) smtp.mailfrom=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 Only compile in PCIe support if the board really uses it. Provide a stub for the init function if e.g. FVP is being built. Cc: Liviu Dudau Cc: Ryan Harkin Signed-off-by: Linus Walleij Reviewed-by: Ryan Harkin Tested-by: Ryan Harkin --- board/armltd/vexpress64/Makefile | 3 ++- board/armltd/vexpress64/pcie.c | 2 -- board/armltd/vexpress64/pcie.h | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile index a35db401b684..b4391a71249a 100644 --- a/board/armltd/vexpress64/Makefile +++ b/board/armltd/vexpress64/Makefile @@ -5,4 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := vexpress64.o pcie.o +obj-y := vexpress64.o +obj-$(CONFIG_TARGET_VEXPRESS64_JUNO) += pcie.o diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index 7b999e8ef40b..311c4500e3ff 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -191,7 +191,5 @@ void xr3pci_init(void) void vexpress64_pcie_init(void) { -#ifdef CONFIG_TARGET_VEXPRESS64_JUNO xr3pci_init(); -#endif } diff --git a/board/armltd/vexpress64/pcie.h b/board/armltd/vexpress64/pcie.h index 14642f4f5c43..55b276d6af11 100644 --- a/board/armltd/vexpress64/pcie.h +++ b/board/armltd/vexpress64/pcie.h @@ -1,6 +1,10 @@ #ifndef __VEXPRESS64_PCIE_H__ #define __VEXPRESS64_PCIE_H__ +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO void vexpress64_pcie_init(void); +#else +static inline void vexpress64_pcie_init(void) {} +#endif #endif /* __VEXPRESS64_PCIE_H__ */