kbuild: arch/mips64 cleanup / O_TARGET removal

arch/mips64/Makefile

@@ -63,29 +63,26 @@ ifdef CONFIG_CPU_R10000
 CFLAGS		:= $(CFLAGS) -mcpu=r8000 -mips4
 endif
 
-ifdef CONFIG_MIPS_FPU_EMULATOR
-CORE_FILES	+= arch/mips64/math-emu/fpu_emulator.o
-SUBDIRS		+= arch/mips64/math-emu
-endif
+core-$(CONFIG_MIPS_FPU_EMULATOR)	+= arch/mips64/math-emu/
 
 #
 # Board-dependent options and extra files
 #
+
 ifdef CONFIG_SGI_IP22
-LIBS          += arch/mips64/sgi-ip22/lib.a arch/mips64/arc/lib.a
-SUBDIRS       += arch/mips64/sgi-ip22 arch/mips64/arc
+libs-y					+= arch/mips64/sgi-ip22/ \
+					   arch/mips64/arc/
 #
 # Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
 # 0x88004000 for production kernels.  Note that the value must be
 # 16kb aligned or the handling of the current variable will break.
 #
-LOADADDR      += 0x88004000
+LOADADDR	+= 0x88004000
 endif
 
 ifdef CONFIG_SGI_IP27
-CORE_FILES    += arch/mips64/sgi-ip27/ip27.o
-LIBS          += arch/mips64/arc/lib.a
-SUBDIRS       += arch/mips64/sgi-ip27 arch/mips64/arc
+core-y					+= arch/mips64/sgi-ip27/
+libs-y					+= arch/mips64/arc/
 #
 # Set LOADADDR to >= 0xc000000000300000 if you want to leave space for
 # symmon, 0xc00000000001c000 for production kernels.  Note that the value
@@ -100,8 +97,8 @@ endif
 endif
 
 ifdef CONFIG_SGI_IP32
-LIBS		+= arch/mips64/sgi-ip32/ip32-kern.a arch/mips64/arc/lib.a
-SUBDIRS		+= arch/mips64/sgi-ip32 arch/mips64/arc
+libs-y					+= arch/mips64/sgi-ip32/
+					   arch/mips64/arc/
 #
 # Set LOADADDR to >= 0x????????? if you want to leave space for symmon,
 # 0x80002000 for production kernels.  Note that the value must be
@@ -133,9 +130,9 @@ LDFLAGS_vmlinux += -Ttext $(LOADADDR)
 
 HEAD := arch/mips64/kernel/head.o arch/mips64/kernel/init_task.o
 
-SUBDIRS := $(addprefix arch/mips64/, tools) $(SUBDIRS) $(addprefix arch/mips64/, kernel mm lib)
-CORE_FILES := arch/mips64/kernel/kernel.o arch/mips64/mm/mm.o $(CORE_FILES)
-LIBS := arch/mips64/lib/lib.a $(LIBS)
+SUBDIRS		:= arch/mips64/tools $(SUBDIRS)
+core-y		+= arch/mips64/kernel/ arch/mips64/mm/
+libs-y		+= arch/mips64/lib/lib.a
 
 MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 

arch/mips64/kernel/Makefile

@@ -2,7 +2,6 @@
 # Makefile for the Linux/MIPS kernel.
 #
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= mips64_ksyms.o

arch/mips64/math-emu/Makefile

 #
 # Makefile for the Linux/MIPS kernel FPU emulation.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET:= fpu_emulator.o
 
 obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
 	   ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \

arch/mips64/mips-boards/atlas/Makefile

@@ -23,8 +23,6 @@
 # under Linux.
 #
 
-O_TARGET := atlas.o
-
 obj-y   := atlas_int.o atlas_rtc.o atlas_setup.o
 
 include $(TOPDIR)/Rules.make

arch/mips64/mips-boards/generic/Makefile

@@ -22,8 +22,6 @@
 # Makefile for the MIPS boards generic routines under Linux.
 #
 
-O_TARGET := mipsboards.o
-
 obj-y                           := mipsIRQ.o pci.o reset.o display.o init.o \
                                    memory.o printf.o cmdline.o time.o
 obj-$(CONFIG_REMOTE_DEBUG)      += gdb_hook.o

arch/mips64/mips-boards/malta/Makefile

@@ -23,8 +23,6 @@
 # under Linux.
 #
 
-O_TARGET := malta.o
-
 obj-y := malta_int.o malta_rtc.o malta_setup.o
 
 include $(TOPDIR)/Rules.make

arch/mips64/mm/Makefile

@@ -2,9 +2,8 @@
 # Makefile for the Linux/MIPS-specific parts of the memory manager.
 #
 
-O_TARGET := mm.o
-
 export-objs			+= umap.o
+
 obj-y				:= extable.o init.o fault.o loadmmu.o
 
 obj-$(CONFIG_CPU_R4300)		+= r4xx0.o

arch/mips64/sgi-ip27/Makefile

@@ -4,8 +4,6 @@
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET = ip27.o
-
 obj-y	:= ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o ip27-irq-glue.o \
 	   ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-pci.o \
 	   ip27-pci-dma.o ip27-reset.o ip27-setup.o ip27-timer.o

arch/mips64/sgi-ip32/Makefile

@@ -3,7 +3,6 @@
 # under Linux.
 #
 
-O_TARGET	:= ip32-kern.a
 EXTRA_TARGETS	:= ip32-irq-glue.o
 
 obj-y		+= ip32-irq.o ip32-rtc.o ip32-setup.o ip32-irq-glue.o \