48b83d2425
arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo
commit 895d30935e
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
There is also a stupid init function ordering problem vs. acpi.o
Add comments to the Makefile to avoid tripping over this again.
Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
24 lines
760 B
Text
24 lines
760 B
Text
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 and NUMAQ 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 irq.o
|
|
|
|
# Necessary for NUMAQ as well
|
|
pci-$(CONFIG_NUMA) += mp_bus_to_node.o
|
|
|
|
obj-y += $(pci-y) common.o early.o
|