ppc64: Makefile cleanup from Sam Ravnborg

arch/ppc64/Makefile

@@ -13,61 +13,47 @@
 # Adjusted for PPC64 by Tom Gall
 #
 
-KERNELLOAD	=0xc000000000000000
+KERNELLOAD	= 0xc000000000000000
 
 LDFLAGS		:= -m elf64ppc
-LDFLAGS_vmlinux	= -Bstatic \
-		-e $(KERNELLOAD) -Ttext $(KERNELLOAD)
+LDFLAGS_vmlinux	= -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
 LDFLAGS_BLOB	:= --format binary --oformat elf64-powerpc
-CFLAGS		:= $(CFLAGS) -msoft-float -pipe \
+CFLAGS		+= -msoft-float -pipe \
 		-Wno-uninitialized -mminimal-toc -mtraceback=full \
 		-finline-limit-2000 -mcpu=power4
-CPP		= $(CC) -E $(CFLAGS)
-
 
 HEAD := arch/ppc64/kernel/head.o
 
-core-y			+= arch/ppc64/kernel/ arch/ppc64/mm/ arch/ppc64/lib/
+libs-y				+= arch/ppc64/lib/
+core-y				+= arch/ppc64/kernel/
+core-y				+= arch/ppc64/mm/
 core-$(CONFIG_XMON)		+= arch/ppc64/xmon/
-
-# FIXME: is drivers- right ?
 drivers-$(CONFIG_OPROFILE)	+= arch/ppc64/oprofile/
 
-makeboot = $(call descend,arch/ppc64/boot,$(1))
-
-ifdef CONFIG_PPC_PSERIES
-BOOT_TARGETS = zImage zImage.initrd
-endif
-
-ifdef CONFIG_PPC_ISERIES
-BOOT_TARGETS = vmlinux.sminitrd vmlinux.initrd vmlinux.sm
-endif
+makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/ppc64/boot $(1)
 
-$(BOOT_TARGETS): vmlinux
-	@$(call makeboot,arch/ppc64/boot/$@)
+boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
+boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
+$(boottarget-y): vmlinux
+	$(call makeboot,arch/ppc64/boot/$@)
 
 %_config: arch/ppc64/configs/%_defconfig
 	rm -f .config arch/ppc64/defconfig
 	cp -f arch/ppc64/configs/$(@:config=defconfig) arch/ppc64/defconfig
 
 archclean:
-	@$(call makeboot,clean)
+	$(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/ppc64/boot
 
-archmrproper:
+prepare: include/asm-ppc64/offsets.h
 
-
-prepare: include/asm-$(ARCH)/offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
+arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
 				   include/config/MARKER
 
-include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
-	@$(generate-asm-offsets.h) < $< > $@
-
-include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
+include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
 	@echo -n '  Generating $@'
+	@$(generate-asm-offsets.h) < $< > $@.tmp
 	@$(update-if-changed)
 
-CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \
-	       include/asm-$(ARCH)/offsets.h
+CLEAN_FILES += include/asm-ppc64/offsets.h.tmp \
+	       include/asm-ppc64/offsets.h
 

arch/ppc64/kernel/Makefile

 #
-# Makefile for the linux kernel.
+# Makefile for the linux ppc64 kernel.
 #
 
-EXTRA_CFLAGS = -mno-minimal-toc
-
-KHEAD := head.o
-
-EXTRA_TARGETS	:= $(KHEAD)
-
+EXTRA_CFLAGS	+= -mno-minimal-toc
+EXTRA_TARGETS	:= head.o
 export-objs	:= ppc_ksyms.o
 
 obj-y               :=	ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \
@@ -17,27 +13,18 @@ obj-y               :=	ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \
 			ioctl32.o ptrace32.o signal32.o open_pic.o xics.o \
 			pmc.o mf_proc.o proc_pmc.o iSeries_setup.o \
 			ItLpQueue.o hvCall.o mf.o HvLpEvent.o ras.o \
-			iSeries_proc.o HvCall.o HvLpConfig.o \
-			rtc.o init_task.o pSeries_htab.o
+			iSeries_proc.o rtc.o init_task.o pSeries_htab.o \
+			prom.o lmb.o rtas.o rtas-proc.o chrp_setup.o i8259.o \
+			pci.o pci_dn.o pci_dma.o
 
-obj-$(CONFIG_PCI) +=  pci.o pci_dn.o pci_dma.o
+obj-$(CONFIG_PPC_ISERIES) += iSeries_pci.o       iSeries_pci_reset.o \
+			     iSeries_IoMmTable.o iSeries_irq.o       \
+			     iSeries_VpdInfo.o   XmPciLpEvent.o \
+			     HvCall.o HvLpConfig.o 
 
-ifeq ($(CONFIG_PPC_ISERIES),y)
-obj-$(CONFIG_PCI) += iSeries_pci.o iSeries_pci_reset.o iSeries_IoMmTable.o iSeries_irq.o iSeries_VpdInfo.o XmPciLpEvent.o 
-endif
-ifeq ($(CONFIG_PPC_PSERIES),y)
-obj-$(CONFIG_PCI) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o eeh.o
-
-obj-y += rtasd.o nvram.o
-endif
+obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
+			     eeh.o rtasd.o nvram.o
 
 obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o
-
 obj-$(CONFIG_SMP)		+= smp.o
-
 obj-$(CONFIG_PROFILING)		+= profile.o
-
-obj-y += prom.o lmb.o rtas.o rtas-proc.o chrp_setup.o i8259.o
-
-include $(TOPDIR)/Rules.make
-

arch/ppc64/lib/Makefile

@@ -2,9 +2,9 @@
 # Makefile for ppc64-specific library files..
 #
 
-export-objs     := dec_and_lock.o
+L_TARGET = lib.a
 
-obj-y           := checksum.o dec_and_lock.o string.o strcase.o copypage.o \
-		   memcpy.o copyuser.o
+export-objs := dec_and_lock.o
 
-include $(TOPDIR)/Rules.make
+obj-y := checksum.o dec_and_lock.o string.o strcase.o
+obj-y += copypage.o memcpy.o copyuser.o

arch/ppc64/mm/Makefile

@@ -2,9 +2,7 @@
 # Makefile for the linux ppc-specific parts of the memory manager.
 #
 
-EXTRA_CFLAGS = -mno-minimal-toc
+EXTRA_CFLAGS += -mno-minimal-toc
 
 obj-y := fault.o init.o extable.o imalloc.o
 obj-$(CONFIG_DISCONTIGMEM) += numa.o
-
-include $(TOPDIR)/Rules.make

arch/ppc64/oprofile/Makefile

 obj-$(CONFIG_OPROFILE) += oprofile.o
 
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
+DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
 		oprof.o cpu_buffer.o buffer_sync.o \
 		event_buffer.o oprofile_files.o \
 		oprofilefs.o oprofile_stats.o )

arch/ppc64/xmon/Makefile

 # Makefile for xmon
 
-EXTRA_CFLAGS = -mno-minimal-toc
+EXTRA_CFLAGS += -mno-minimal-toc
 
 obj-y := start.o xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
-
-include $(TOPDIR)/Rules.make