diff options
author | Arnd Bergmann <arnd@arndb.de> | 2006-11-27 13:18:55 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:41:12 -0500 |
commit | e055595d3e5f5233374211bc6893e5d16976df99 (patch) | |
tree | 2694e83df4035fb4a17276d605ba507d50ffcc05 /arch/powerpc/xmon | |
parent | da06aa08d9f23e4f970d9a25a6e52f9a7736bfa2 (diff) |
[POWERPC] cell: fix building without spufs
It may be desireable to build a kernel for cell without
spufs, e.g. as the initial kboot kernel. This requires
that the SPU specific parts of the core dump and the xmon
code depend on CONFIG_SPU_BASE instead of CONFIG_PPC_CELL.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r-- | arch/powerpc/xmon/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/xmon/Makefile b/arch/powerpc/xmon/Makefile index 69303575d3d6..51d97588e762 100644 --- a/arch/powerpc/xmon/Makefile +++ b/arch/powerpc/xmon/Makefile | |||
@@ -8,5 +8,5 @@ obj-y += xmon.o setjmp.o start.o nonstdio.o | |||
8 | 8 | ||
9 | ifdef CONFIG_XMON_DISASSEMBLY | 9 | ifdef CONFIG_XMON_DISASSEMBLY |
10 | obj-y += ppc-dis.o ppc-opc.o | 10 | obj-y += ppc-dis.o ppc-opc.o |
11 | obj-$(CONFIG_PPC_CELL) += spu-dis.o spu-opc.o | 11 | obj-$(CONFIG_SPU_BASE) += spu-dis.o spu-opc.o |
12 | endif | 12 | endif |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1cf90c8ac34a..dc8a3760a98c 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -213,7 +213,7 @@ Commands:\n\ | |||
213 | p call a procedure\n\ | 213 | p call a procedure\n\ |
214 | r print registers\n\ | 214 | r print registers\n\ |
215 | s single step\n" | 215 | s single step\n" |
216 | #ifdef CONFIG_PPC_CELL | 216 | #ifdef CONFIG_SPU_BASE |
217 | " ss stop execution on all spus\n\ | 217 | " ss stop execution on all spus\n\ |
218 | sr restore execution on stopped spus\n\ | 218 | sr restore execution on stopped spus\n\ |
219 | sf # dump spu fields for spu # (in hex)\n\ | 219 | sf # dump spu fields for spu # (in hex)\n\ |
@@ -2654,7 +2654,7 @@ void __init xmon_setup(void) | |||
2654 | debugger(NULL); | 2654 | debugger(NULL); |
2655 | } | 2655 | } |
2656 | 2656 | ||
2657 | #ifdef CONFIG_PPC_CELL | 2657 | #ifdef CONFIG_SPU_BASE |
2658 | 2658 | ||
2659 | struct spu_info { | 2659 | struct spu_info { |
2660 | struct spu *spu; | 2660 | struct spu *spu; |
@@ -2907,7 +2907,7 @@ static int do_spu_cmd(void) | |||
2907 | 2907 | ||
2908 | return 0; | 2908 | return 0; |
2909 | } | 2909 | } |
2910 | #else /* ! CONFIG_PPC_CELL */ | 2910 | #else /* ! CONFIG_SPU_BASE */ |
2911 | static int do_spu_cmd(void) | 2911 | static int do_spu_cmd(void) |
2912 | { | 2912 | { |
2913 | return -1; | 2913 | return -1; |