Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
[safe/jmp/linux-2.6] / arch / powerpc / kernel / Makefile
index 631149e..bf0b1fd 100644 (file)
 # Makefile for the linux kernel.
 #
 
+CFLAGS_ptrace.o                += -DUTS_MACHINE='"$(UTS_MACHINE)"'
+
 ifeq ($(CONFIG_PPC64),y)
-EXTRA_CFLAGS   += -mno-minimal-toc
+CFLAGS_prom_init.o     += -mno-minimal-toc
 endif
 ifeq ($(CONFIG_PPC32),y)
 CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o         += -fPIC
 endif
 
-obj-y                          := semaphore.o cputable.o ptrace.o syscalls.o \
-                                  signal_32.o pmc.o
-obj-$(CONFIG_PPC64)            += setup_64.o binfmt_elf32.o sys_ppc32.o \
-                                  signal_64.o ptrace32.o systbl.o
+ifdef CONFIG_FTRACE
+# Do not trace early boot code
+CFLAGS_REMOVE_cputable.o = -pg
+CFLAGS_REMOVE_prom_init.o = -pg
+
+ifdef CONFIG_DYNAMIC_FTRACE
+# dynamic ftrace setup.
+CFLAGS_REMOVE_ftrace.o = -pg
+endif
+
+endif
+
+obj-y                          := cputable.o ptrace.o syscalls.o \
+                                  irq.o align.o signal_32.o pmc.o vdso.o \
+                                  init_task.o process.o systbl.o idle.o \
+                                  signal.o
+obj-y                          += vdso32/
+obj-$(CONFIG_PPC64)            += setup_64.o sys_ppc32.o \
+                                  signal_64.o ptrace32.o \
+                                  paca.o cpu_setup_ppc970.o \
+                                  cpu_setup_pa6t.o \
+                                  firmware.o sysfs.o nvram_64.o
+obj-$(CONFIG_PPC64)            += vdso64/
 obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
-obj-$(CONFIG_POWER4)           += idle_power4.o
-obj-$(CONFIG_PPC_OF)           += of_device.o
-obj-$(CONFIG_PPC_RTAS)         += rtas.o
+obj-$(CONFIG_PPC_970_NAP)      += idle_power4.o
+obj-$(CONFIG_PPC_OF)           += of_device.o of_platform.o prom_parse.o
+obj-$(CONFIG_PPC_CLOCK)                += clock.o
+procfs-$(CONFIG_PPC64)         := proc_ppc64.o
+obj-$(CONFIG_PROC_FS)          += $(procfs-y)
+rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI)  := rtas_pci.o
+obj-$(CONFIG_PPC_RTAS)         += rtas.o rtas-rtc.o $(rtaspci-y-y)
 obj-$(CONFIG_RTAS_FLASH)       += rtas_flash.o
 obj-$(CONFIG_RTAS_PROC)                += rtas-proc.o
+obj-$(CONFIG_LPARCFG)          += lparcfg.o
 obj-$(CONFIG_IBMVIO)           += vio.o
+obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)   += smp-tbsync.o
+obj-$(CONFIG_CRASH_DUMP)       += crash_dump.o
+obj-$(CONFIG_E500)             += idle_e500.o
+obj-$(CONFIG_6xx)              += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
+obj-$(CONFIG_TAU)              += tau_6xx.o
+obj-$(CONFIG_HIBERNATION)      += swsusp.o suspend.o \
+                                  swsusp_$(CONFIG_WORD_SIZE).o
+obj64-$(CONFIG_HIBERNATION)    += swsusp_asm64.o
+obj-$(CONFIG_MODULES)          += module.o module_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_44x)              += cpu_setup_44x.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
 extra-$(CONFIG_PPC_STD_MMU)    := head_32.o
 extra-$(CONFIG_PPC64)          := head_64.o
-extra-$(CONFIG_40x)            := head_4xx.o
+extra-$(CONFIG_40x)            := head_40x.o
 extra-$(CONFIG_44x)            := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)      := head_fsl_booke.o
 extra-$(CONFIG_8xx)            := head_8xx.o
 extra-y                                += vmlinux.lds
 
-obj-y                          += process.o init_task.o time.o \
-                                  prom.o traps.o setup-common.o
-obj-$(CONFIG_PPC32)            += entry_32.o setup_32.o misc_32.o systbl.o
-obj-$(CONFIG_PPC64)            += misc_64.o
-obj-$(CONFIG_PPC_OF)           += prom_init.o
+obj-y                          += time.o prom.o traps.o setup-common.o \
+                                  udbg.o misc.o io.o \
+                                  misc_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_PPC32)            += entry_32.o setup_32.o
+obj-$(CONFIG_PPC64)            += dma_64.o iommu.o
+obj-$(CONFIG_PPC_MULTIPLATFORM)        += prom_init.o
 obj-$(CONFIG_MODULES)          += ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
-obj-$(CONFIG_6xx)              += idle_6xx.o
+obj-$(CONFIG_SMP)              += smp.o
+obj-$(CONFIG_KPROBES)          += kprobes.o
+obj-$(CONFIG_PPC_UDBG_16550)   += legacy_serial.o udbg_16550.o
+obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 
-ifeq ($(CONFIG_PPC_ISERIES),y)
-$(obj)/head_64.o: $(obj)/lparmap.s
-AFLAGS_head_64.o += -I$(obj)
+pci64-$(CONFIG_PPC64)          += pci_dn.o isa-bridge.o
+obj-$(CONFIG_PCI)              += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
+                                  pci-common.o
+obj-$(CONFIG_PCI_MSI)          += msi.o
+obj-$(CONFIG_KEXEC)            += machine_kexec.o crash.o \
+                                  machine_kexec_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_AUDIT)            += audit.o
+obj64-$(CONFIG_AUDIT)          += compat_audit.o
+
+obj-$(CONFIG_DYNAMIC_FTRACE)   += ftrace.o
+
+obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
+
+ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
+obj-y                          += iomap.o
 endif
 
 else
-# stuff used from here for ARCH=ppc or ARCH=ppc64
-obj-$(CONFIG_PPC64)            += traps.o process.o init_task.o time.o \
-                                  setup-common.o
-
+# stuff used from here for ARCH=ppc
+smpobj-$(CONFIG_SMP)           += smp.o
 
 endif
 
+obj-$(CONFIG_PPC64)            += $(obj64-y)
+
 extra-$(CONFIG_PPC_FPU)                += fpu.o
 extra-$(CONFIG_PPC64)          += entry_64.o
+
+extra-y                                += systbl_chk.i
+$(obj)/systbl.o:               systbl_chk
+
+quiet_cmd_systbl_chk = CALL    $<
+      cmd_systbl_chk = $(CONFIG_SHELL) $< $(obj)/systbl_chk.i
+
+PHONY += systbl_chk
+systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
+       $(call cmd,systbl_chk)
+
+
+ifeq ($(CONFIG_PPC_MERGE),y)
+
+$(obj)/built-in.o:             prom_init_check
+
+quiet_cmd_prom_init_check = CALL    $<
+      cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" "$(obj)/prom_init.o"
+
+PHONY += prom_init_check
+prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
+       $(call cmd,prom_init_check)
+
+endif
+
+
+clean-files := vmlinux.lds