diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-27 04:17:06 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-27 04:17:06 -0500 |
commit | e7e2d2da26384b07dfee83f63e6090e386c63d7e (patch) | |
tree | ee990ef6d6b1d5233ed6a1df751ecd6ac7e178cc | |
parent | 8b844dd7591a820a618a8fb33c9c43186d43d1b9 (diff) |
powerpc: Don't compile in arch/ppc/kernel for 32-bit ARCH=powerpc
All of the things needed for 32-bit ARCH=powerpc builds have now
moved to arch/powerpc/kernel, so we don't need to go down into
arch/ppc/kernel any more, and we can remove the CONFIG_PPC_MERGE
conditional from arch/ppc/kernel/Makefile.
There were two files still referenced in the merge section of
arch/ppc/kernel/Makefile: ppc-stub.o, depending on CONFIG_KGDB,
and dma-mapping.o, depending on CONFIG_NOT_COHERENT_CACHE. None
of the platforms currently in ARCH=powerpc have caches that
aren't coherent with DMA, but when we do get one we'll move
dma-mapping.c over. As for CONFIG_KGDB, none of the Kconfig
files in the tree define it, so I'll let it languish for now.
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc/kernel/Makefile | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 829e017b8a5..9586899de68 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -129,7 +129,6 @@ core-y += arch/powerpc/kernel/ \ | |||
129 | arch/powerpc/lib/ \ | 129 | arch/powerpc/lib/ \ |
130 | arch/powerpc/sysdev/ \ | 130 | arch/powerpc/sysdev/ \ |
131 | arch/powerpc/platforms/ | 131 | arch/powerpc/platforms/ |
132 | core-$(CONFIG_PPC32) += arch/ppc/kernel/ | ||
133 | core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ | 132 | core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ |
134 | core-$(CONFIG_XMON) += arch/powerpc/xmon/ | 133 | core-$(CONFIG_XMON) += arch/powerpc/xmon/ |
135 | core-$(CONFIG_APUS) += arch/ppc/amiga/ | 134 | core-$(CONFIG_APUS) += arch/ppc/amiga/ |
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 4b7a05655cf..466437f4bcb 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
@@ -1,8 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
3 | # | 3 | # |
4 | ifneq ($(CONFIG_PPC_MERGE),y) | ||
5 | |||
6 | extra-$(CONFIG_PPC_STD_MMU) := head.o | 4 | extra-$(CONFIG_PPC_STD_MMU) := head.o |
7 | extra-$(CONFIG_40x) := head_4xx.o | 5 | extra-$(CONFIG_40x) := head_4xx.o |
8 | extra-$(CONFIG_44x) := head_44x.o | 6 | extra-$(CONFIG_44x) := head_44x.o |
@@ -24,10 +22,3 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | |||
24 | ifndef CONFIG_MATH_EMULATION | 22 | ifndef CONFIG_MATH_EMULATION |
25 | obj-$(CONFIG_8xx) += softemu8xx.o | 23 | obj-$(CONFIG_8xx) += softemu8xx.o |
26 | endif | 24 | endif |
27 | |||
28 | # These are here while we do the architecture merge | ||
29 | |||
30 | else | ||
31 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | ||
32 | obj-$(CONFIG_KGDB) += ppc-stub.o | ||
33 | endif | ||