kbuild: arch/cris cleanup / O_TARGET removal

arch/cris/Makefile

@@ -32,16 +32,16 @@ AFLAGS += -mlinux
 
 HEAD := arch/cris/kernel/head.o
 
-SUBDIRS += arch/cris/kernel arch/cris/mm arch/cris/lib arch/cris/drivers
 ifdef CONFIG_ETRAX_AXISFLASHMAP
 # only build this if axis flash map is used, because they depend on
 # each others config options
 SUBDIRS += arch/cris/boot/rescue
 endif
-CORE_FILES := arch/cris/kernel/kernel.o arch/cris/mm/mm.o $(CORE_FILES)
-DRIVERS += arch/cris/drivers/drivers.o
 LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
-LIBS := $(TOPDIR)/arch/cris/lib/lib.a $(LIBS) $(TOPDIR)/arch/cris/lib/lib.a $(LIBGCC)
+
+core-y		+= arch/cris/kernel/   arch/cris/mm/
+drivers-y	+= arch/cris/drivers/
+libs-y		+= arch/cris/lib/lib.a $(LIBGCC)
 
 MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 

arch/cris/drivers/Makefile

@@ -2,11 +2,6 @@
 # Makefile for Etrax-specific drivers
 #
 
-O_TARGET := drivers.o
-
-obj-y :=
-
-
 obj-$(CONFIG_ETRAX_ETHERNET)            += ethernet.o
 obj-$(CONFIG_ETRAX_SERIAL)              += serial.o
 obj-$(CONFIG_ETRAX_IDE)                 += ide.o
@@ -18,10 +13,7 @@ obj-$(CONFIG_ETRAX_USB_HOST)            += usb-host.o
 obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)  += sync_serial.o
 obj-$(CONFIG_ETRAX_PARPORT)             += parport.o
 obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
-
-
-obj-$(CONFIG_ETRAX_ETHERNET_LPSLAVE)    += lpslave/lpslavedrivers.o
-subdir-$(CONFIG_ETRAX_ETHERNET_LPSLAVE) += lpslave
+obj-$(CONFIG_ETRAX_ETHERNET_LPSLAVE)    += lpslave
 
 include $(TOPDIR)/Rules.make
 

arch/cris/drivers/lpslave/Makefile

@@ -2,11 +2,8 @@
 # Makefile for parallel port slave drivers
 #
 
-O_TARGET := lpslavedrivers.o
-
 obj-y = e100lpslavenet.o e100lpslave_code.o
 
-
 include $(TOPDIR)/Rules.make
 
 e100lpslave_code.o:	e100lpslave.o e100lpslaveld 

arch/cris/kernel/Makefile

@@ -3,7 +3,6 @@
 # Makefile for the linux kernel.
 #
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o
 
 export-objs := ksyms.o

arch/cris/mm/Makefile

 #
 # Makefile for the linux cris-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
 obj-y	 := init.o fault.o tlb.o extable.o ioremap.o
 
 include $(TOPDIR)/Rules.make