From patchwork Wed Nov 18 10:39:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 56934 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2482334lbb; Wed, 18 Nov 2015 02:39:57 -0800 (PST) X-Received: by 10.194.115.199 with SMTP id jq7mr1041587wjb.101.1447843197016; Wed, 18 Nov 2015 02:39:57 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id t206si39779768wmt.109.2015.11.18.02.39.56; Wed, 18 Nov 2015 02:39:56 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 302A14B7CA; Wed, 18 Nov 2015 11:39:50 +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 fgwdsAPilGHl; Wed, 18 Nov 2015 11:39:49 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9524F4B7B1; Wed, 18 Nov 2015 11:39:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B47B4B72F for ; Wed, 18 Nov 2015 11:39:33 +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 n_DxWXvJRYfl for ; Wed, 18 Nov 2015 11:39:33 +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-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by theia.denx.de (Postfix) with ESMTPS id 3B59E4B70B for ; Wed, 18 Nov 2015 11:39:30 +0100 (CET) Received: by wmww144 with SMTP id w144so191084654wmw.1 for ; Wed, 18 Nov 2015 02:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qXmT8oMrRIZJ7o4mkhl2N7ZaoPnvHOBCIVT0GkYluB4=; b=Y8zVhAuE/J9EEgj0p3ckM1lFhoat/rfI6rs9myvlBZo8F7bLLybSBfr2tLfD8/PbMI elQf9VHb3a5YzJxt3xnm2TydgJTtxw1fpfEB/RxsdYfkv2VLtwuZXrBmZLaWinNzotNw /ICNwx/WxNhZK+vkRCmnl96y5l4Pfgov7G1r0OVsctFtpx6GTFAw+CvKLPpvhmVcdBkw flT2vgE+/Nr9ZjsMf/+jsjwmnS12PnuNxxfUHjZAZ9LYYWU+haJrhSD7lF760HkI6ofI JvWtg/9Azn49VAj0E2xKPcambI25+dk3IasP8psX4uh3dum5CH7vP5HYhjSGtBUwM235 7UuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qXmT8oMrRIZJ7o4mkhl2N7ZaoPnvHOBCIVT0GkYluB4=; b=MtzqI8kxXZRZ8/Rfjqi4egsR7DSi62pVvo6lW6wur6k+znR3qNOxu1hJVpQCDJt1nU 2gUHXI9VA4IUjaDhsu1GucJqWcebTIg6FaJnBKumyzLl7Dik6/3Rgv+zSBnkdLXhvHZR /Jrp76gOlFdBoNsZwnPaQ7JjgJiCMkLDErqiWjGiIe2UAJ7NcNd4t+5yUjgQlcKjJs0y 6h4qcHhN9yzRxppRUufq8xC7Tl0OPFTFHb69IRbDwx8xBQ3b4HYAOk+epUKXUmhdXYHG w/wBP1zSowI2UMjyeZUxRNE8O1ItheYoiQK3eqree9ST3BR/IwMpMtQZP8866iTV9EjZ XNkg== X-Gm-Message-State: ALoCoQl122NrOTL2Jb5duQujKuj3+D24Dsf/AWCTQKyzIRYSJbB7FnUMhySicXrknTgkFrcePL9i X-Received: by 10.28.129.82 with SMTP id c79mr3300576wmd.80.1447843169853; Wed, 18 Nov 2015 02:39:29 -0800 (PST) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id c4sm2148269wjs.36.2015.11.18.02.39.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Nov 2015 02:39:29 -0800 (PST) From: Ryan Harkin To: Tom Rini , u-boot@lists.denx.de Date: Wed, 18 Nov 2015 10:39:06 +0000 Message-Id: <1447843149-28412-2-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447843149-28412-1-git-send-email-ryan.harkin@linaro.org> References: <1447843149-28412-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae , Liviu Dudau , Stefan Roese Subject: [U-Boot] [PATCH v2 1/4] vexpress64: compile Juno PCIe conditionally X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion 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" Only compile in PCIe support if the board really uses it. Provide a __weak stub for the init function if e.g. FVP is being built. Signed-off-by: Ryan Harkin Acked-by: Linus Walleij --- board/armltd/vexpress64/Makefile | 3 ++- board/armltd/vexpress64/pcie.c | 2 -- board/armltd/vexpress64/vexpress64.c | 7 +++++++ 3 files changed, 9 insertions(+), 3 deletions(-) -- 2.1.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile index a35db40..b4391a7 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 7b999e8..311c450 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/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index f4e8084..3add099 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -28,6 +28,13 @@ U_BOOT_DEVICE(vexpress_serials) = { .platdata = &serial_platdata, }; +/* This function gets replaced by platforms supporting PCIe. + * The replacement function, eg. on Juno, initialises the PCIe bus. + */ +__weak void vexpress64_pcie_init(void) +{ +} + int board_init(void) { vexpress64_pcie_init();