kbuild: arch/mips cleanup / O_TARGET removal

arch/mips/Makefile

@@ -94,15 +94,13 @@ ASFLAGS		+= $(GCCFLAGS)
 #
 # We unconditionally build the math emulator
 #
-CORE_FILES	+=arch/mips/math-emu/fpu_emulator.o
-SUBDIRS		+=arch/mips/math-emu
+core-y		+= arch/mips/math-emu/
 
 #
 # Board-dependent options and extra files
 #
 ifdef CONFIG_ALGOR_P4032
-CORE_FILES    += arch/mips/algor/algor.o
-SUBDIRS       += arch/mips/algor
+core-y		+= arch/mips/algor/
 LOADADDR	+= 0x80000000
 endif
 
@@ -110,21 +108,18 @@ endif
 # DECstation family
 #
 ifdef CONFIG_DECSTATION
-CORE_FILES    += arch/mips/dec/dec.o
-SUBDIRS       += arch/mips/dec arch/mips/dec/prom
-LIBS          += arch/mips/dec/prom/lib.a
+core-y		+= arch/mips/dec/
+libs-y          += arch/mips/dec/prom/
 LOADADDR	+= 0x80040000
 endif
 
 ifdef CONFIG_MIPS_ATLAS
-LIBS          += arch/mips/mips-boards/atlas/atlas.o arch/mips/mips-boards/generic/mipsboards.o
-SUBDIRS       += arch/mips/mips-boards/generic arch/mips/mips-boards/atlas
+core-y		+= arch/mips/mips-boards/atlas/ arch/mips/mips-boards/generic/
 LOADADDR	+= 0x80100000
 endif
 
 ifdef CONFIG_MIPS_MALTA
-LIBS          += arch/mips/mips-boards/malta/malta.o arch/mips/mips-boards/generic/mipsboards.o
-SUBDIRS       += arch/mips/mips-boards/malta arch/mips/mips-boards/generic
+core-y          += arch/mips/mips-boards/malta/ arch/mips/mips-boards/generic/
 LOADADDR	+= 0x80100000
 endif
 
@@ -132,23 +127,20 @@ endif
 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
 #
 ifdef CONFIG_MIPS_JAZZ
-CORE_FILES    += arch/mips/jazz/jazz.o
-SUBDIRS       += arch/mips/jazz arch/mips/arc
-LIBS          += arch/mips/arc/lib.a
+core-y		+= arch/mips/jazz/
+libs-y		+= arch/mips/arc/
 LOADADDR	+= 0x80080000
 endif
 
 ifdef CONFIG_SNI_RM200_PCI
-CORE_FILES    += arch/mips/sni/sni.o
-SUBDIRS       += arch/mips/sni arch/mips/arc
-LIBS          += arch/mips/arc/lib.a
+core-y		+= arch/mips/sni/
+libs-y		+= arch/mips/arc/
 LOADADDR	+= 0x80080000
 endif
 
 ifdef CONFIG_SGI_IP22
-CORE_FILES    += arch/mips/sgi/kernel/ip22-kern.o
-LIBS          += arch/mips/arc/lib.a
-SUBDIRS       += arch/mips/sgi/kernel arch/mips/arc
+core-y		+= arch/mips/sgi/kernel/
+libs-y		+= arch/mips/arc/
 #
 # Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
 # 0x88002000 for production kernels.  Note that the value must be
@@ -161,8 +153,8 @@ endif
 # Baget/MIPS
 #
 ifdef CONFIG_BAGET_MIPS
-SUBDIRS       += arch/mips/baget arch/mips/baget/prom
-LIBS          += arch/mips/baget/baget.a arch/mips/baget/prom/lib.a
+core-y		+= arch/mips/baget/
+libs-y		+= arch/mips/baget/prom/
 LOADADDR	+= 0x80001000
 endif
 
@@ -170,8 +162,7 @@ endif
 # NEC DDB Vrc-5074
 #
 ifdef CONFIG_DDB5074
-SUBDIRS       += arch/mips/ddb5074
-LIBS          += arch/mips/ddb5074/ddb5074.a
+core-y		+= arch/mips/ddb5074/
 LOADADDR	+= 0x80080000
 endif
 
@@ -180,8 +171,7 @@ endif
 # NEC DDB Vrc-5476
 #
 ifdef CONFIG_DDB5476
-SUBDIRS       += arch/mips/ddb5476
-LIBS          += arch/mips/ddb5476/ddb5476.a
+core-y		+= arch/mips/ddb5476/
 LOADADDR	+= 0x80080000
 endif
 
@@ -190,9 +180,8 @@ endif
 # NEC DDB Vrc-5477
 #
 ifdef CONFIG_DDB5477
-SUBDIRS       += arch/mips/ddb5xxx/common arch/mips/ddb5xxx/ddb5477
-LIBS          += arch/mips/ddb5xxx/common/ddb5xxx.o \
-                 arch/mips/ddb5xxx/ddb5477/ddb5477.o
+core-y		+= arch/mips/ddb5xxx/common/ \
+		   arch/mips/ddb5xxx/ddb5477/
 LOADADDR	+= 0x80080000
 endif
 
@@ -200,8 +189,7 @@ endif
 # Galileo EV64120 Board
 #
 ifdef CONFIG_MIPS_EV64120
-LIBS          += arch/mips/galileo-boards/ev64120/ev64120.o
-SUBDIRS       += arch/mips/galileo-boards/ev64120
+core-y		+= arch/mips/galileo-boards/ev64120/
 LOADADDR	+= 0x80100000
 endif
 
@@ -209,8 +197,8 @@ endif
 # Galileo EV96100 Board
 #
 ifdef CONFIG_MIPS_EV96100
-LIBS          += arch/mips/galileo-boards/ev96100/ev96100.o arch/mips/galileo-boards/generic/galboards.o
-SUBDIRS       += arch/mips/galileo-boards/generic arch/mips/galileo-boards/ev96100
+core-y		+= arch/mips/galileo-boards/ev96100/ \
+		   arch/mips/galileo-boards/generic/
 LOADADDR	+= 0x80100000
 endif
 
@@ -220,8 +208,8 @@ endif
 ifdef CONFIG_MOMENCO_OCELOT
 # The Ocelot setup.o must be linked early - it does the ioremap() for the
 # mips_io_port_base.
-CORE_FILES    += arch/mips/gt64120/common/gt64120.o arch/mips/gt64120/momenco_ocelot/momenco_ocelot.o
-SUBDIRS       += arch/mips/gt64120/common arch/mips/gt64120/momenco_ocelot
+core-y		+= arch/mips/gt64120/common/ \
+		   arch/mips/gt64120/momenco_ocelot/
 LOADADDR	+= 0x80100000
 endif
 
@@ -229,8 +217,7 @@ endif
 # Philips Nino
 #
 ifdef CONFIG_NINO
-CORE_FILES    += arch/mips/philips/nino/nino.o
-SUBDIRS       += arch/mips/philips/nino
+core-y		+= arch/mips/philips/nino/
 LOADADDR	+= 0x80000000
 endif
 
@@ -238,8 +225,8 @@ endif
 # ITE 8172 eval board with QED 5231 CPU
 #
 ifdef CONFIG_MIPS_ITE8172
-LIBS          += arch/mips/ite-boards/qed-4n-s01b/ite.o arch/mips/ite-boards/generic/it8172.o
-SUBDIRS       += arch/mips/ite-boards/generic arch/mips/ite-boards/qed-4n-s01b
+core-y		+= arch/mips/ite-boards/qed-4n-s01b/ \
+		   arch/mips/ite-boards/generic/
 LOADADDR	+= 0x80100000
 endif
 
@@ -247,8 +234,8 @@ endif
 # Globespan IVR eval board with QED 5231 CPU
 #
 ifdef CONFIG_MIPS_IVR
-LIBS          += arch/mips/ite-boards/ivr/ivr.o arch/mips/ite-boards/generic/it8172.o
-SUBDIRS       += arch/mips/ite-boards/generic arch/mips/ite-boards/ivr
+core-y		+= arch/mips/ite-boards/ivr/ \
+		   arch/mips/ite-boards/generic/
 LOADADDR	+= 0x80100000
 endif
 
@@ -256,8 +243,8 @@ endif
 # Au1000 eval board
 #
 ifdef CONFIG_MIPS_PB1000
-LIBS          += arch/mips/au1000/pb1000/pb1000.o arch/mips/au1000/common/au1000.o
-SUBDIRS       += arch/mips/au1000/pb1000 arch/mips/au1000/common
+core-y		+= arch/mips/au1000/pb1000/ \
+		   arch/mips/au1000/common/
 LOADADDR	+= 0x80100000
 endif
 
@@ -271,9 +258,10 @@ AFLAGS_vmlinux.lds.o := -DLOADADDR=$(LOADADDR)
 
 HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
 
-SUBDIRS := $(addprefix arch/mips/, tools) $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib)
-CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES)
-LIBS := arch/mips/lib/lib.a $(LIBS)
+SUBDIRS := arch/mips/tools
+
+core-y		+= arch/mips/kernel/ arch/mips/mm/
+libs-y		+= arch/mips/lib/lib.a
 
 ifdef CONFIG_BAGET_MIPS
 

arch/mips/au1000/common/Makefile

@@ -6,8 +6,6 @@
 # Makefile for the Alchemy Au1000 CPU, generic files.
 #
 
-O_TARGET := au1000.o
-
 export-objs := serial.o
 
 obj-y := prom.o dbg_io.o int-handler.o irq.o puts.o time.o reset.o

arch/mips/au1000/pb1000/Makefile

@@ -6,8 +6,6 @@
 # Makefile for the Alchemy Semiconductor PB1000 board.
 #
 
-O_TARGET := pb1000.o
-
 obj-y := init.o setup.o
 
 include $(TOPDIR)/Rules.make

arch/mips/baget/Makefile

@@ -3,8 +3,6 @@
 # under Linux.
 #
 
-O_TARGET := baget.a
-
 export-objs		:= vacserial.o
 obj-y			:= baget.o print.o setup.o time.o irq.o bagetIRQ.o \
 			   reset.o wbflush.o

arch/mips/ddb5074/Makefile

@@ -2,17 +2,9 @@
 # Makefile for the NEC DDB Vrc-5074 specific kernel interface routines
 # under Linux.
 #
-# 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).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-#
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET = ddb5074.a
-
 obj-y	:= setup.o irq.o time.o prom.o pci.o int-handler.o nile4.o
 
 include $(TOPDIR)/Rules.make

arch/mips/ddb5476/Makefile

@@ -2,17 +2,9 @@
 # Makefile for the NEC DDB Vrc-5074 specific kernel interface routines
 # under Linux.
 #
-# 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).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-#
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET = ddb5476.a
-
 obj-y				+= setup.o irq.o time.o prom.o pci.o \
 				   int-handler.o nile4.o
 obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o

arch/mips/ddb5xxx/common/Makefile

 #
 # Makefile for the common code of NEC DDB-Vrc5xxx board
 #
-# 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:= ddb5xxx.o
 
 obj-y	 += irq.o irq_cpu.o nile4.o prom.o pci.o pci_auto.o rtc_ds1386.o
 

arch/mips/ddb5xxx/ddb5477/Makefile

 #
 # Makefile for NEC DDB-Vrc5477 board
 #
-# 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).
-#
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET:= ddb5477.o
-
 obj-y	 += int-handler.o irq.o irq_5477.o setup.o pci.o pci_ops.o
 
 obj-$(CONFIG_LL_DEBUG) 		+= debug.o

arch/mips/dec/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the DECstation family specific parts of the kernel
 #
 
-O_TARGET := dec.o
-
 export-objs := wbflush.o
 
 obj-y	 := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o

arch/mips/dec/boot/Makefile

@@ -4,9 +4,7 @@
 
 netboot: all
 	mipsel-linux-ld -N -G 0 -T ld.ecoff ../../boot/zImage \
-		dec_boot.o ramdisk.img -o nbImage
-
-O_TARGET := dec_boot.o
+		built-in.o ramdisk.img -o nbImage
 
 obj-y	 := decstation.o
 

arch/mips/gt64120/common/Makefile

 #
 # Makefile for common code of gt64120-based boards.
 #
-# 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:= gt64120.o
 
 obj-y	 := gt_irq.o pci.o
 

arch/mips/gt64120/momenco_ocelot/Makefile

 #
 # Makefile for Momentum's Ocelot board.
 #
-# 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).
-#
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-O_TARGET:= momenco_ocelot.o
-
 obj-y	 += int-handler.o irq.o pci.o prom.o reset.o setup.o
 
 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o

arch/mips/ite-boards/generic/Makefile

@@ -6,8 +6,6 @@
 # Makefile for the ITE 8172 (qed-4n-s01b) board, generic files.
 #
 
-O_TARGET := it8172.o
-
 obj-y := it8172_rtc.o it8172_setup.o irq.o int-handler.o pmon_prom.o time.o lpc.o puts.o reset.o
 
 ifdef CONFIG_PCI

arch/mips/ite-boards/ivr/Makefile

@@ -7,8 +7,6 @@
 # board-specific files.
 #
 
-O_TARGET := ivr.o
-
 obj-y := init.o 
 
 obj-$(CONFIG_PCI) += pci_fixup.o

arch/mips/ite-boards/qed-4n-s01b/Makefile

@@ -7,13 +7,8 @@
 # specific files.
 #
 
-O_TARGET := ite.o
-
 obj-y := init.o 
 obj-$(CONFIG_PCI) += pci_fixup.o
 obj-$(CONFIG_BLK_DEV_INITRD) += le_ramdisk.o
 
 include $(TOPDIR)/Rules.make
-
-dep:
-	$(CPP) -M *.c > .depend

arch/mips/jazz/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Jazz family specific parts of the kernel
 #
 
-O_TARGET := jazz.o
-
 obj-y	 := int-handler.o irq.o jazzdma.o reset.o rtc-jazz.o setup.o \
 	    floppy-jazz.o kbd-jazz.o
 

arch/mips/kernel/Makefile

@@ -4,7 +4,6 @@
 
 # EXTRA_AFLAGS = -mips3 -mcpu=r4000 # not used?
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
 export-objs	:= mips_ksyms.o
 

arch/mips/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/mips/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/mips/mips-boards/generic/Makefile

@@ -21,16 +21,9 @@
 #
 # Makefile for the MIPS boards generic routines under Linux.
 #
-# 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).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
 
 EXTRA_AFLAGS := $(CFLAGS)
 
-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/mips/mips-boards/malta/Makefile

@@ -22,13 +22,6 @@
 # Makefile for the MIPS Malta specific kernel interface routines
 # under Linux.
 #
-# 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).
-#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-
-O_TARGET := malta.o
 
 obj-y := malta_int.o malta_rtc.o malta_setup.o
 

arch/mips/mm/Makefile

 #
 # Makefile for the Linux/MIPS-specific parts of the memory manager.
 #
-# 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).
-#
-# Note 2! The CFLAGS definition is now in the main makefile...
-
-O_TARGET := mm.o
 
 export-objs			+= ioremap.o umap.o
 obj-y				+= extable.o init.o ioremap.o fault.o loadmmu.o

arch/mips/philips/nino/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Philips Nino specific parts of the kernel
 #
 
-O_TARGET := nino.o
-
 obj-y	 := int-handler.o setup.o irq.o time.o reset.o rtc.o prom.o power.o
 
 obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb.o

arch/mips/sgi/kernel/Makefile

@@ -3,8 +3,6 @@
 # under Linux.
 #
 
-O_TARGET := ip22-kern.o
-
 obj-y	+= indy_mc.o indy_sc.o indy_hpc.o indy_int.o indy_rtc.o system.o \
 	   indyIRQ.o reset.o setup.o time.o
 

arch/mips/sni/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the SNI specific part of the kernel
 #
 
-O_TARGET := sni.o
-
 obj-y	 := int-handler.o io.o irq.o pci.o pcimt_scache.o reset.o setup.o
 
 EXTRA_AFLAGS := $(CFLAGS)