aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-12 01:55:09 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-12 19:49:45 -0400
commit4920960f577edcb0a5ef03823a53911cca5875e1 (patch)
treec37bb1a8b02f54e3a5012bac7f726208e6fc488e /arch/ppc64/kernel/Makefile
parent7e130edf712ac054aecf643f9d3d0142a9679e6a (diff)
powerpc: consolidate cputable.c
Also simplify arch/ppc64/kernel/Makefile Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r--arch/ppc64/kernel/Makefile85
1 files changed, 24 insertions, 61 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 5569ea7e6830..834aef034b77 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -7,13 +7,17 @@ ifneq ($(CONFIG_PPC_MERGE),y)
7EXTRA_CFLAGS += -mno-minimal-toc 7EXTRA_CFLAGS += -mno-minimal-toc
8extra-y := head.o vmlinux.lds 8extra-y := head.o vmlinux.lds
9 9
10obj-y := setup.o entry.o irq.o idle.o dma.o \ 10obj-y := setup.o entry.o misc.o prom.o
11 time.o signal.o syscalls.o misc.o ptrace.o \ 11
12endif
13
14obj-y += irq.o idle.o dma.o \
15 time.o signal.o syscalls.o ptrace.o \
12 align.o bitops.o pacaData.o \ 16 align.o bitops.o pacaData.o \
13 udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ 17 udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
14 ptrace32.o signal32.o rtc.o \ 18 ptrace32.o signal32.o rtc.o \
15 cputable.o cpu_setup_power4.o \ 19 cpu_setup_power4.o \
16 iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o 20 iommu.o sysfs.o vdso.o pmc.o firmware.o
17obj-y += vdso32/ vdso64/ 21obj-y += vdso32/ vdso64/
18 22
19obj-$(CONFIG_PPC_OF) += of_device.o 23obj-$(CONFIG_PPC_OF) += of_device.o
@@ -22,7 +26,10 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o
22 26
23obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) 27obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
24 28
25obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o 29obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o
30ifneq ($(CONFIG_PPC_MERGE),y)
31obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
32endif
26 33
27obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o 34obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
28 35
@@ -34,22 +41,29 @@ obj-$(CONFIG_EEH) += eeh.o
34obj-$(CONFIG_PROC_FS) += proc_ppc64.o 41obj-$(CONFIG_PROC_FS) += proc_ppc64.o
35obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o 42obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
36obj-$(CONFIG_SMP) += smp.o 43obj-$(CONFIG_SMP) += smp.o
37obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o 44obj-$(CONFIG_MODULES) += module.o
45ifneq ($(CONFIG_PPC_MERGE),y)
46obj-$(CONFIG_MODULES) += ppc_ksyms.o
47endif
38obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o 48obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o
39obj-$(CONFIG_RTAS_PROC) += rtas-proc.o 49obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
40obj-$(CONFIG_SCANLOG) += scanlog.o 50obj-$(CONFIG_SCANLOG) += scanlog.o
41obj-$(CONFIG_LPARCFG) += lparcfg.o 51obj-$(CONFIG_LPARCFG) += lparcfg.o
42obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o 52obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
53ifneq ($(CONFIG_PPC_MERGE),y)
43obj-$(CONFIG_BOOTX_TEXT) += btext.o 54obj-$(CONFIG_BOOTX_TEXT) += btext.o
55endif
44obj-$(CONFIG_HVCS) += hvcserver.o 56obj-$(CONFIG_HVCS) += hvcserver.o
45 57
46obj-$(CONFIG_IBMVIO) += vio.o $(vio-obj-y) 58obj-$(CONFIG_IBMVIO) += vio.o
47obj-$(CONFIG_XICS) += xics.o 59obj-$(CONFIG_XICS) += xics.o
60ifneq ($(CONFIG_PPC_MERGE),y)
48obj-$(CONFIG_MPIC) += mpic.o 61obj-$(CONFIG_MPIC) += mpic.o
49 62
50obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \ 63obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \
51 pmac_time.o pmac_nvram.o pmac_low_i2c.o \ 64 pmac_time.o pmac_nvram.o pmac_low_i2c.o \
52 udbg_scc.o 65 udbg_scc.o
66endif
53 67
54obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \ 68obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
55 udbg_16550.o 69 udbg_16550.o
@@ -57,7 +71,9 @@ obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
57obj-$(CONFIG_U3_DART) += u3_iommu.o 71obj-$(CONFIG_U3_DART) += u3_iommu.o
58 72
59ifdef CONFIG_SMP 73ifdef CONFIG_SMP
74ifneq ($(CONFIG_PPC_MERGE),y)
60obj-$(CONFIG_PPC_PMAC) += pmac_smp.o smp-tbsync.o 75obj-$(CONFIG_PPC_PMAC) += pmac_smp.o smp-tbsync.o
76endif
61obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o 77obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o
62endif 78endif
63 79
@@ -65,62 +81,9 @@ obj-$(CONFIG_KPROBES) += kprobes.o
65 81
66CFLAGS_ioctl32.o += -Ifs/ 82CFLAGS_ioctl32.o += -Ifs/
67 83
84ifneq ($(CONFIG_PPC_MERGE),y)
68ifeq ($(CONFIG_PPC_ISERIES),y) 85ifeq ($(CONFIG_PPC_ISERIES),y)
69arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s 86arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
70AFLAGS_head.o += -Iarch/powerpc/kernel 87AFLAGS_head.o += -Iarch/powerpc/kernel
71endif 88endif
72
73else
74
75# Things still needed from here by the merged ppc code
76
77obj-y := irq.o idle.o dma.o \
78 time.o signal.o syscalls.o ptrace.o \
79 align.o bitops.o pacaData.o \
80 udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
81 ptrace32.o signal32.o rtc.o \
82 cputable.o cpu_setup_power4.o \
83 iommu.o sysfs.o vdso.o pmc.o firmware.o
84obj-y += vdso32/ vdso64/
85
86pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o
87
88obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)
89
90obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o
91
92obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o
93
94obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
95 bpa_iic.o spider-pic.o
96
97obj-$(CONFIG_KEXEC) += machine_kexec.o
98obj-$(CONFIG_EEH) += eeh.o
99obj-$(CONFIG_PROC_FS) += proc_ppc64.o
100obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
101obj-$(CONFIG_SMP) += smp.o
102obj-$(CONFIG_MODULES) += module.o
103obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o
104obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
105obj-$(CONFIG_SCANLOG) += scanlog.o
106obj-$(CONFIG_LPARCFG) += lparcfg.o
107obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
108obj-$(CONFIG_HVCS) += hvcserver.o
109
110obj-$(CONFIG_IBMVIO) += vio.o
111obj-$(CONFIG_XICS) += xics.o
112
113obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
114 udbg_16550.o
115
116obj-$(CONFIG_U3_DART) += u3_iommu.o
117
118ifdef CONFIG_SMP
119obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o
120endif
121
122obj-$(CONFIG_KPROBES) += kprobes.o
123
124CFLAGS_ioctl32.o += -Ifs/
125
126endif 89endif