Commit 9de0eec2 authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Lorenzo Pieralisi
Browse files

PCI: Regroup all PCI related entries into drivers/pci/Makefile 



Clean up drivers/Makefile by moving the pci/endpoint and pci/dwc entries
from drivers/Makefile into drivers/pci/Makefile.

Since we don't want to introduce any dependency between CONFIG_PCI and
CONFIG_PCI_ENDPOINT, we now always execute drivers/pci/Makefile.

Hence all Makefiles in drivers/pci/ were updated accordingly so no file is
compiled when CONFIG_PCI is not defined.

Also, we add a comment to reinforce that EPC and EPF libraries must be
initialized before their users. Hence built-in EPC drivers, such as
those of Designware, are linked after the endpoint core libraries.

Finally, we add another comment to explain why obj-y has been chosen
instead of obj-$(CONFIG_PCIE_DW) to parse the dwc/ sub-folder.

Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@free-electrons.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 1291a0d5

drivers/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl/ 
obj-$(CONFIG_GPIOLIB)		+= gpio/

obj-y				+= pwm/



obj-$(CONFIG_PCI)		+= pci/

obj-$(CONFIG_PCI_ENDPOINT)	+= pci/endpoint/

# PCI dwc controller drivers

obj-y				+= pci/dwc/

obj-y				+= pci/



obj-$(CONFIG_PARISC)		+= parisc/

obj-$(CONFIG_RAPIDIO)		+= rapidio/

drivers/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ config PCI_PASID 


config PCI_LABEL

	def_bool y if (DMI || ACPI)

	depends on PCI

	select NLS



config PCI_HYPERV

drivers/pci/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -3,12 +3,15 @@ 
# Makefile for the PCI bus specific drivers.

#



obj-y		+= access.o bus.o probe.o host-bridge.o remove.o pci.o \

obj-$(CONFIG_PCI)	+= access.o bus.o probe.o host-bridge.o remove.o pci.o \

			pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \

			irq.o vpd.o setup-bus.o vc.o mmap.o setup-irq.o



ifdef CONFIG_PCI

obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_SYSFS) += slot.o

obj-$(CONFIG_OF) += of.o

endif



obj-$(CONFIG_PCI_QUIRKS) += quirks.o
@@ -44,10 +47,14 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o 


obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o



obj-$(CONFIG_OF) += of.o



ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG



# PCI host controller drivers

obj-y += host/

obj-y += switch/



obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/



# Endpoint library must be initialized before its users

# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

obj-y				+= dwc/

drivers/pci/dwc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,4 +27,6 @@ obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o 
# ARM64 and use internal ifdefs to only build the pieces we need

# depending on whether ACPI, the DT driver, or both are enabled.



ifdef CONFIG_PCI

obj-$(CONFIG_ARM64) += pcie-hisi.o

endif

drivers/pci/host/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ obj-$(CONFIG_VMD) += vmd.o 
# ARM64 and use internal ifdefs to only build the pieces we need

# depending on whether ACPI, the DT driver, or both are enabled.



ifdef CONFIG_PCI

obj-$(CONFIG_ARM64) += pci-thunder-ecam.o

obj-$(CONFIG_ARM64) += pci-thunder-pem.o

obj-$(CONFIG_ARM64) += pci-xgene.o

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE