Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e055595d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[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: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
parent da06aa08

arch/powerpc/xmon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/xmon/xmon.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -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