public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb•de>
To: Paul Mackerras <paulus@ozlabs•org>
Cc: linuxppc-dev@ozlabs•org, cbe-oss-dev@ozlabs•org,
	Arnd Bergmann <arnd.bergmann@de•ibm.com>
Subject: [POWERPC 4/9] cell: fix building without spufs
Date: Mon, 27 Nov 2006 19:18:55 +0100	[thread overview]
Message-ID: <20061127182430.576009000@arndb.de> (raw)
In-Reply-To: 20061127181851.796747000@arndb.de

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>

Index: linux-2.6/arch/powerpc/xmon/Makefile
===================================================================
--- linux-2.6.orig/arch/powerpc/xmon/Makefile
+++ linux-2.6/arch/powerpc/xmon/Makefile
@@ -8,5 +8,5 @@ obj-y			+= xmon.o setjmp.o start.o nonst
 
 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
Index: linux-2.6/arch/powerpc/xmon/xmon.c
===================================================================
--- linux-2.6.orig/arch/powerpc/xmon/xmon.c
+++ linux-2.6/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;
Index: linux-2.6/include/asm-powerpc/elf.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/elf.h
+++ linux-2.6/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
 

--

  parent reply	other threads:[~2006-11-27 18:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-27 18:18 [POWERPC 0/9] cell bug fixes for 2.6.20 Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 1/9] spufs: return an error in spu_create is isolated create isnt supported Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 2/9] spufs: always send sigtrap on breakpoint Arnd Bergmann
2006-11-28  0:12   ` Luke Browning
2006-11-28  0:29     ` Arnd Bergmann
2006-11-27 18:18 ` [POWERPC 3/9] spufs: we should only execute init_spu_base on cell Arnd Bergmann
2006-11-27 18:18 ` Arnd Bergmann [this message]
2006-11-27 18:18 ` [POWERPC 5/9] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 Arnd Bergmann
2006-11-28  0:40   ` Geoff Levand
2006-11-27 18:18 ` [POWERPC 6/9] ps3: multiplatform build fixes Arnd Bergmann
2006-11-28 21:05   ` [Cbe-oss-dev] " Geoff Levand
2006-11-27 18:18 ` [POWERPC 7/9] ps3: add a default zImage target Arnd Bergmann
2006-11-28  0:59   ` Geoff Levand
2006-11-27 18:18 ` [POWERPC 8/9] fix missing #include in sys_ppc32.c Arnd Bergmann
2006-11-27 18:19 ` [POWERPC 9/9] fix building without PCI Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061127182430.576009000@arndb.de \
    --to=arnd@arndb$(echo .)de \
    --cc=arnd.bergmann@de$(echo .)ibm.com \
    --cc=cbe-oss-dev@ozlabs$(echo .)org \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=paulus@ozlabs$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox