powerpc: Get 64-bit configs to compile with ARCH=powerpc
[linux-2.6.git] / arch / ppc64 / kernel / Makefile
index 79366e4..5c59889 100644 (file)
@@ -2,14 +2,14 @@
 # Makefile for the linux ppc64 kernel.
 #
 
-EXTRA_CFLAGS   += -mno-minimal-toc
 ifneq ($(CONFIG_PPC_MERGE),y)
+
+EXTRA_CFLAGS   += -mno-minimal-toc
 extra-y                := head.o vmlinux.lds
-endif
 
 obj-y               := setup.o entry.o irq.o idle.o dma.o \
                        time.o process.o signal.o syscalls.o misc.o ptrace.o \
-                       align.o semaphore.o bitops.o pacaData.o \
+                       align.o bitops.o pacaData.o \
                        udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
                        ptrace32.o signal32.o rtc.o init_task.o \
                        cputable.o cpu_setup_power4.o \
@@ -43,7 +43,6 @@ obj-$(CONFIG_HVC_CONSOLE)     += hvconsole.o
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
 obj-$(CONFIG_HVCS)             += hvcserver.o
 
-vio-obj-$(CONFIG_PPC_PSERIES)  += pSeries_vio.o
 obj-$(CONFIG_IBMVIO)           += vio.o $(vio-obj-y)
 obj-$(CONFIG_XICS)             += xics.o
 obj-$(CONFIG_MPIC)             += mpic.o
@@ -59,8 +58,6 @@ obj-$(CONFIG_U3_DART)         += u3_iommu.o
 
 ifdef CONFIG_SMP
 obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o smp-tbsync.o
-obj-$(CONFIG_PPC_PSERIES)      += pSeries_smp.o
-obj-$(CONFIG_PPC_BPA)          += pSeries_smp.o
 obj-$(CONFIG_PPC_MAPLE)                += smp-tbsync.o
 endif
 
@@ -68,9 +65,62 @@ obj-$(CONFIG_KPROBES)                += kprobes.o
 
 CFLAGS_ioctl32.o += -Ifs/
 
-ifneq ($(CONFIG_PPC_MERGE),y)
 ifeq ($(CONFIG_PPC_ISERIES),y)
 arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
 AFLAGS_head.o += -Iarch/powerpc/kernel
 endif
+
+else
+
+# Things still needed from here by the merged ppc code
+
+obj-y               := irq.o idle.o dma.o \
+                       time.o signal.o syscalls.o ptrace.o \
+                       align.o bitops.o pacaData.o \
+                       udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
+                       ptrace32.o signal32.o rtc.o \
+                       cputable.o cpu_setup_power4.o \
+                       iommu.o sysfs.o vdso.o pmc.o firmware.o
+obj-y += vdso32/ vdso64/
+
+pci-obj-$(CONFIG_PPC_MULTIPLATFORM)    += pci_dn.o pci_direct_iommu.o
+
+obj-$(CONFIG_PCI)      += pci.o pci_iommu.o iomap.o $(pci-obj-y)
+
+obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o
+
+obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
+
+obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
+                        bpa_iic.o spider-pic.o
+
+obj-$(CONFIG_KEXEC)            += machine_kexec.o
+obj-$(CONFIG_EEH)              += eeh.o
+obj-$(CONFIG_PROC_FS)          += proc_ppc64.o
+obj-$(CONFIG_RTAS_FLASH)       += rtas_flash.o
+obj-$(CONFIG_SMP)              += smp.o
+obj-$(CONFIG_MODULES)          += module.o
+obj-$(CONFIG_PPC_RTAS)         += rtas.o rtas_pci.o
+obj-$(CONFIG_RTAS_PROC)                += rtas-proc.o
+obj-$(CONFIG_SCANLOG)          += scanlog.o
+obj-$(CONFIG_LPARCFG)          += lparcfg.o
+obj-$(CONFIG_HVC_CONSOLE)      += hvconsole.o
+obj-$(CONFIG_HVCS)             += hvcserver.o
+
+obj-$(CONFIG_IBMVIO)           += vio.o
+obj-$(CONFIG_XICS)             += xics.o
+
+obj-$(CONFIG_PPC_MAPLE)                += maple_setup.o maple_pci.o maple_time.o \
+                                  udbg_16550.o
+
+obj-$(CONFIG_U3_DART)          += u3_iommu.o
+
+ifdef CONFIG_SMP
+obj-$(CONFIG_PPC_MAPLE)                += smp-tbsync.o
+endif
+
+obj-$(CONFIG_KPROBES)          += kprobes.o
+
+CFLAGS_ioctl32.o += -Ifs/
+
 endif