Commit 658c7479 authored by Linus Torvalds's avatar Linus Torvalds

Clean up and fix Makefile from x86 CPU split

parent 80edade6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
EXTRA_TARGETS := first_rule kernel.o head.o init_task.o EXTRA_TARGETS := kernel.o head.o init_task.o
O_TARGET := kernel.o O_TARGET := kernel.o
...@@ -13,6 +13,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ...@@ -13,6 +13,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \ pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \
bootflag.o bootflag.o
obj-y += cpu/
obj-$(CONFIG_MCA) += mca.o obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_EISA) += eisa.o obj-$(CONFIG_EISA) += eisa.o
obj-$(CONFIG_MTRR) += mtrr.o obj-$(CONFIG_MTRR) += mtrr.o
...@@ -34,8 +35,4 @@ endif ...@@ -34,8 +35,4 @@ endif
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional
kernel-subdir-y := cpu
subdir-y := $(kernel-subdir-y)
obj-y += $(foreach dir,$(kernel-subdir-y),$(dir)/$(dir).o)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
O_TARGET := cpu.o #
# Makefile for x86-compatible CPU details and quirks
#
obj-y := common.o proc.o
obj-y += amd.o obj-y += amd.o
obj-y += cyrix.o obj-y += cyrix.o
...@@ -9,7 +13,4 @@ obj-y += rise.o ...@@ -9,7 +13,4 @@ obj-y += rise.o
obj-y += nexgen.o obj-y += nexgen.o
obj-y += umc.o obj-y += umc.o
obj-y += common.o
obj-y += proc.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment