diff options
author | Paul Mackerras <paulus@samba.org> | 2007-10-03 21:02:09 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 21:02:09 -0400 |
commit | 26f571d7c968dbd30656fc1421eeb0d9088aaad9 (patch) | |
tree | 96b4df5f75b70cf102bf83dece20dafcde0b2e48 /arch/powerpc/kernel/Makefile | |
parent | e077b50c29a7e8be5812d1156934ea837b712ca6 (diff) |
[PPC] Use cpu setup routines from cpu_setup_44x.S for ARCH=ppc
Commit 8112753bb2c0045398c89d0647792b39805f6d40 made 44x in
ARCH=powerpc builds use cpu setup routines in cpu_setup_44x.S,
but didn't make a similar change for ARCH=ppc, and consequently
the ARCH=ppc builds fail with undefined symbols (since both use
the same cputable.c).
This fixes it by including cpu_setup_44x.S in the ARCH=ppc builds,
and by taking out the now-redundant FPU initialization in
arch/ppc/kernel/head_44x.S.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index f1dd90439efc..8327d92eeca8 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -42,6 +42,7 @@ obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o \ | |||
42 | swsusp_$(CONFIG_WORD_SIZE).o | 42 | swsusp_$(CONFIG_WORD_SIZE).o |
43 | obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o | 43 | obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o |
44 | obj-$(CONFIG_MODULES) += module_$(CONFIG_WORD_SIZE).o | 44 | obj-$(CONFIG_MODULES) += module_$(CONFIG_WORD_SIZE).o |
45 | obj-$(CONFIG_44x) += cpu_setup_44x.o | ||
45 | 46 | ||
46 | ifeq ($(CONFIG_PPC_MERGE),y) | 47 | ifeq ($(CONFIG_PPC_MERGE),y) |
47 | 48 | ||
@@ -58,7 +59,6 @@ obj-y += time.o prom.o traps.o setup-common.o \ | |||
58 | misc_$(CONFIG_WORD_SIZE).o | 59 | misc_$(CONFIG_WORD_SIZE).o |
59 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o | 60 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o |
60 | obj-$(CONFIG_PPC64) += dma_64.o iommu.o | 61 | obj-$(CONFIG_PPC64) += dma_64.o iommu.o |
61 | obj-$(CONFIG_44x) += cpu_setup_44x.o | ||
62 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o | 62 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |
63 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 63 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
64 | obj-$(CONFIG_BOOTX_TEXT) += btext.o | 64 | obj-$(CONFIG_BOOTX_TEXT) += btext.o |