From 3a42c885100d38db2f95fa3bd3ae96ae8e501de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 23 Jan 2019 16:02:28 +0200
Subject: device/pci: Organize Makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use a single group for all CONFIG_PCI=y sources.

Change-Id: I426f4398c01dfbf03b9dd2db8c7a964512c86d5e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31680
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/device/Makefile.inc | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc
index 39df1c7b9c..c325a7e5bd 100644
--- a/src/device/Makefile.inc
+++ b/src/device/Makefile.inc
@@ -2,18 +2,9 @@ ramstage-y += device.c
 ramstage-y += root_device.c
 ramstage-y += cpu_device.c
 ramstage-y += device_util.c
-ramstage-$(CONFIG_PCI) += pci_class.c
-ramstage-$(CONFIG_PCI) += pci_device.c
-ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c
-ramstage-$(CONFIG_PCIX_PLUGIN_SUPPORT) += pcix_device.c
-ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += pciexp_device.c
-ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += cardbus_device.c
 ramstage-$(CONFIG_AZALIA_PLUGIN_SUPPORT) += azalia_device.c
 ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += pnp_device.c
 ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_64) += pnp_device.c
-ramstage-$(CONFIG_PCI) += pci_ops.c
-ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c
-ramstage-$(CONFIG_PCI) += pci_rom.c
 ramstage-y += smbus_ops.c
 
 ifeq ($(CONFIG_AZALIA_PLUGIN_SUPPORT),y)
@@ -27,10 +18,23 @@ verstage-y += device_const.c
 romstage-y += device_const.c
 ramstage-y += device_const.c
 
-bootblock-$(CONFIG_PCI) += pci_early.c
-verstage-$(CONFIG_PCI) += pci_early.c
-romstage-$(CONFIG_PCI) += pci_early.c
-postcar-$(CONFIG_PCI) += pci_early.c
+ifeq ($(CONFIG_PCI),y)
+bootblock-y += pci_early.c
+verstage-y += pci_early.c
+romstage-y += pci_early.c
+postcar-y += pci_early.c
+
+ramstage-y += pci_class.c
+ramstage-y += pci_device.c
+ramstage-y += pci_ops.c
+ramstage-y += pci_rom.c
+
+ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c
+ramstage-$(CONFIG_PCIX_PLUGIN_SUPPORT) += pcix_device.c
+ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += pciexp_device.c
+ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += cardbus_device.c
+ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c
+endif
 
 subdirs-y += oprom dram
 
-- 
cgit v1.2.3