diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 06:11:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:21 -0500 |
commit | a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (patch) | |
tree | eb3d0ffaf53c3f7ec6083752c2097cecd1cb892a /arch/sparc/kernel/Makefile | |
parent | d670bd4f803c8b646acd20f3ba21e65458293faf (diff) |
sparc,sparc64: unify kernel/
o Move all files from sparc64/kernel/ to sparc/kernel
- rename as appropriate
o Update sparc/Makefile to the changes
o Update sparc/kernel/Makefile to include the sparc64 files
NOTE: This commit changes link order on sparc64!
Link order had to change for either of sparc32 and sparc64.
And assuming sparc64 see more testing than sparc32 change link
order on sparc64 where issues will be caught faster.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/Makefile')
-rw-r--r-- | arch/sparc/kernel/Makefile | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 6558eea5f0bc..46439465c3b2 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile | |||
@@ -38,6 +38,19 @@ obj-$(CONFIG_SPARC32) += muldiv.o | |||
38 | obj-y += prom_$(BITS).o | 38 | obj-y += prom_$(BITS).o |
39 | obj-y += of_device_$(BITS).o | 39 | obj-y += of_device_$(BITS).o |
40 | 40 | ||
41 | obj-$(CONFIG_SPARC64) += reboot.o | ||
42 | obj-$(CONFIG_SPARC64) += sysfs.o | ||
43 | obj-$(CONFIG_SPARC64) += iommu.o | ||
44 | obj-$(CONFIG_SPARC64) += central.o | ||
45 | obj-$(CONFIG_SPARC64) += starfire.o | ||
46 | obj-$(CONFIG_SPARC64) += power.o | ||
47 | obj-$(CONFIG_SPARC64) += sbus.o | ||
48 | obj-$(CONFIG_SPARC64) += ebus.o | ||
49 | obj-$(CONFIG_SPARC64) += visemul.o | ||
50 | obj-$(CONFIG_SPARC64) += hvapi.o | ||
51 | obj-$(CONFIG_SPARC64) += sstate.o | ||
52 | obj-$(CONFIG_SPARC64) += mdesc.o | ||
53 | |||
41 | # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation | 54 | # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation |
42 | obj-$(CONFIG_SPARC32) += devres.o | 55 | obj-$(CONFIG_SPARC32) += devres.o |
43 | devres-y := ../../../kernel/irq/devres.o | 56 | devres-y := ../../../kernel/irq/devres.o |
@@ -48,6 +61,7 @@ obj-$(CONFIG_SPARC32_PCI) += pcic.o | |||
48 | 61 | ||
49 | obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o | 62 | obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o |
50 | obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o | 63 | obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o |
64 | obj-$(CONFIG_SPARC64_SMP) += hvtramp.o | ||
51 | 65 | ||
52 | obj-y += auxio_$(BITS).o | 66 | obj-y += auxio_$(BITS).o |
53 | obj-$(CONFIG_SUN_PM) += apc.o pmc.o | 67 | obj-$(CONFIG_SUN_PM) += apc.o pmc.o |
@@ -56,3 +70,28 @@ obj-$(CONFIG_MODULES) += module_$(BITS).o | |||
56 | obj-$(CONFIG_MODULES) += sparc_ksyms_$(BITS).o | 70 | obj-$(CONFIG_MODULES) += sparc_ksyms_$(BITS).o |
57 | obj-$(CONFIG_SPARC_LED) += led.o | 71 | obj-$(CONFIG_SPARC_LED) += led.o |
58 | obj-$(CONFIG_KGDB) += kgdb_$(BITS).o | 72 | obj-$(CONFIG_KGDB) += kgdb_$(BITS).o |
73 | |||
74 | |||
75 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | ||
76 | CFLAGS_REMOVE_ftrace.o := -pg | ||
77 | |||
78 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | ||
79 | # sparc64 PCI | ||
80 | obj-$(CONFIG_SPARC64_PCI) += pci.o pci_common.o psycho_common.o | ||
81 | obj-$(CONFIG_SPARC64_PCI) += pci_psycho.o pci_sabre.o pci_schizo.o | ||
82 | obj-$(CONFIG_SPARC64_PCI) += pci_sun4v.o pci_sun4v_asm.o pci_fire.o | ||
83 | obj-$(CONFIG_PCI_MSI) += pci_msi.o | ||
84 | |||
85 | obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o | ||
86 | |||
87 | # sparc64 cpufreq | ||
88 | obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o | ||
89 | obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o | ||
90 | obj-$(CONFIG_US3_MC) += chmc.o | ||
91 | |||
92 | obj-$(CONFIG_KPROBES) += kprobes.o | ||
93 | obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o | ||
94 | |||
95 | obj-$(CONFIG_AUDIT) += audit.o | ||
96 | audit--$(CONFIG_AUDIT) := compat_audit.o | ||
97 | obj-$(CONFIG_COMPAT) += $(audit--y) | ||