Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d8566ac authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

x86/pci: Makefile merge: Removing Makefile_* 



No functional nor ordering changes here.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d028203c

arch/x86/pci/Makefile

+46 −2
Original line number Diff line number Diff line 
ifeq ($(CONFIG_X86_32),y)

include ${srctree}/arch/x86/pci/Makefile_32



obj-y				:= i386.o init.o



obj-$(CONFIG_PCI_BIOS)		+= pcbios.o

obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_32.o direct.o mmconfig-shared.o

obj-$(CONFIG_PCI_DIRECT)	+= direct.o

obj-$(CONFIG_PCI_OLPC)		+= olpc.o



pci-y				:= fixup.o



# Do not change the ordering here. There is a nasty init function

# ordering dependency which breaks when you move acpi.o below

# legacy/irq.o

pci-$(CONFIG_ACPI)		+= acpi.o

pci-y				+= legacy.o irq.o



# Careful: VISWS overrule the pci-y above. The colons are

# therefor correct. This needs a proper fix by distangling the code.

pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o



pci-$(CONFIG_X86_NUMAQ)		+= numa.o



# Necessary for NUMAQ as well

pci-$(CONFIG_NUMA)		+= mp_bus_to_node.o



obj-y				+= $(pci-y) common.o early.o

obj-y				+= amd_bus.o



else

include ${srctree}/arch/x86/pci/Makefile_64



#

# Makefile for X86_64 specific PCI routines

#

# Reuse the i386 PCI subsystem

#

EXTRA_CFLAGS += -Iarch/x86/pci



obj-y		:= i386.o

obj-$(CONFIG_PCI_DIRECT)+= direct.o

obj-y		+= fixup.o init.o

obj-$(CONFIG_ACPI)	+= acpi.o

obj-y			+= legacy.o irq.o common.o early.o

# mmconfig has a 64bit special

obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o



obj-y		+= amd_bus.o



endif

arch/x86/pci/Makefile_32

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
obj-y				:= i386.o init.o



obj-$(CONFIG_PCI_BIOS)		+= pcbios.o

obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_32.o direct.o mmconfig-shared.o

obj-$(CONFIG_PCI_DIRECT)	+= direct.o

obj-$(CONFIG_PCI_OLPC)		+= olpc.o



pci-y				:= fixup.o



# Do not change the ordering here. There is a nasty init function

# ordering dependency which breaks when you move acpi.o below

# legacy/irq.o

pci-$(CONFIG_ACPI)		+= acpi.o

pci-y				+= legacy.o irq.o



# Careful: VISWS overrule the pci-y above. The colons are

# therefor correct. This needs a proper fix by distangling the code.

pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o



pci-$(CONFIG_X86_NUMAQ)		+= numa.o



# Necessary for NUMAQ as well

pci-$(CONFIG_NUMA)		+= mp_bus_to_node.o



obj-y				+= $(pci-y) common.o early.o

obj-y				+= amd_bus.o

arch/x86/pci/Makefile_64

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#

# Makefile for X86_64 specific PCI routines

#

# Reuse the i386 PCI subsystem

#

EXTRA_CFLAGS += -Iarch/x86/pci



obj-y		:= i386.o

obj-$(CONFIG_PCI_DIRECT)+= direct.o

obj-y		+= fixup.o init.o

obj-$(CONFIG_ACPI)	+= acpi.o

obj-y			+= legacy.o irq.o common.o early.o

# mmconfig has a 64bit special

obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o



obj-y		+= amd_bus.o