summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2006-11-27 19:18:55 +0100
committerPaul Mackerras <paulus@samba.org>2006-12-04 20:41:12 +1100
commite055595d3e5f5233374211bc6893e5d16976df99 (patch)
tree2694e83df4035fb4a17276d605ba507d50ffcc05
parentda06aa08d9f23e4f970d9a25a6e52f9a7736bfa2 (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>
-rw-r--r--arch/powerpc/xmon/Makefile2
-rw-r--r--arch/powerpc/xmon/xmon.c6
-rw-r--r--include/asm-powerpc/elf.h2
3 files changed, 5 insertions, 5 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
ifdef CONFIG_XMON_DISASSEMBLY
obj-y += ppc-dis.o ppc-opc.o
-obj-$(CONFIG_PPC_CELL) += spu-dis.o spu-opc.o
+obj-$(CONFIG_SPU_BASE) += spu-dis.o spu-opc.o
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\
p call a procedure\n\
r print registers\n\
s single step\n"
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
" ss stop execution on all spus\n\
sr restore execution on stopped spus\n\
sf # dump spu fields for spu # (in hex)\n\
@@ -2654,7 +2654,7 @@ void __init xmon_setup(void)
debugger(NULL);
}
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
struct spu_info {
struct spu *spu;
@@ -2907,7 +2907,7 @@ static int do_spu_cmd(void)
return 0;
}
-#else /* ! CONFIG_PPC_CELL */
+#else /* ! CONFIG_SPU_BASE */
static int do_spu_cmd(void)
{
return -1;
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h
index 4545aa682509..b5436642a109 100644
--- a/include/asm-powerpc/elf.h
+++ b/include/asm-powerpc/elf.h
@@ -411,7 +411,7 @@ do { \
/* Keep this the last entry. */
#define R_PPC64_NUM 107
-#ifdef CONFIG_PPC_CELL
+#ifdef CONFIG_SPU_BASE
/* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
#define NT_SPU 1