diff mbox

[U-Boot,v2,1/4] vexpress64: compile Juno PCIe conditionally

Message ID 1447843149-28412-2-git-send-email-ryan.harkin@linaro.org
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Ryan Harkin Nov. 18, 2015, 10:39 a.m. UTC 
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 <ryan.harkin@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
 board/armltd/vexpress64/Makefile     | 3 ++-
 board/armltd/vexpress64/pcie.c       | 2 --
 board/armltd/vexpress64/vexpress64.c | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

Comments

Tom Rini Nov. 22, 2015, 3:55 p.m. UTC | #1 
On Wed, Nov 18, 2015 at 10:39:06AM +0000, Ryan Harkin wrote:

> 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 <ryan.harkin@linaro.org>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

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();