kbuild: arch/sh cleanup / O_TARGET removal

arch/sh/Makefile

@@ -55,18 +55,15 @@ CFLAGS		+= -pipe
 
 HEAD := arch/sh/kernel/head.o arch/sh/kernel/init_task.o
 
-SUBDIRS := $(SUBDIRS) $(addprefix arch/sh/, kernel mm lib)
-CORE_FILES := arch/sh/kernel/kernel.o arch/sh/mm/mm.o $(CORE_FILES)
 LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-LIBS := $(TOPDIR)/arch/sh/lib/lib.a $(LIBS) $(TOPDIR)/arch/sh/lib/lib.a \
-	$(LIBGCC)
 
-MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+core-y				+= arch/sh/kernel/ arch/sh/mm/
+core-$(CONFIG_SH_GENERIC)	+= arch/sh/stboards/
+core-$(CONFIG_SH_STB1_HARP)	+= arch/sh/stboards/
+core-$(CONFIG_SH_STB1_OVERDRIVE)+= arch/sh/stboards/
+libs-y				+= arch/sh/lib/	$(LIBGCC)
 
-ifneq ($(CONFIG_SH_GENERIC)$(CONFIG_SH_STB1_HARP)$(CONFIG_SH_STB1_OVERDRIVE),)
-SUBDIRS += arch/sh/stboards
-CORE_FILES += arch/sh/stboards/stboards.o
-endif
+MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
 
 AFLAGS_vmlinux.lds.o := -traditional
 

arch/sh/kernel/Makefile

@@ -2,7 +2,6 @@
 # Makefile for the Linux/SuperH kernel.
 #
 
-O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
 
 export-objs	:= io.o io_generic.o io_hd64465.o setup_hd64465.o sh_ksyms.o \

arch/sh/mm/Makefile

 #
 # Makefile for the Linux SuperH-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 extable.o clear_page.o copy_page.o
 
 obj-$(CONFIG_CPU_SH3) += cache-sh3.o

arch/sh/stboards/Makefile

@@ -2,8 +2,6 @@
 # Makefile for STMicroelectronics board specific parts of the kernel
 #
 
-O_TARGET := stboards.o
-
 obj-y := irq.o setup.o mach.o led.o
 
 include $(TOPDIR)/Rules.make