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

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

[PATCH] powerpc: Rename BPA to Cell 



The official name for BPA is now CBEA (Cell Broadband
Engine Architecture). This patch renames all occurences
of the term BPA to 'Cell' for easier recognition.

Signed-off-by: default avatarArnd Bergmann <arndb@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3c4cf5ee

arch/powerpc/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@ config PPC_MAPLE 
          This option enables support for the Maple 970FX Evaluation Board.

	  For more informations, refer to <http://www.970eval.com>



config PPC_BPA

	bool "  Broadband Processor Architecture"

config PPC_CELL

	bool "  Cell Broadband Processor Architecture"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_RTAS
@@ -358,8 +358,8 @@ config MPIC_BROKEN_U3 
	depends on PPC_MAPLE

	default y



config BPA_IIC

	depends on PPC_BPA

config CELL_IIC

	depends on PPC_CELL

	bool

	default y

arch/powerpc/kernel/prom_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, 
#endif



	/*

	 * On pSeries and BPA, copy the CPU hold code

	 * Copy the CPU hold code

	 */

       	if (RELOC(of_platform) != PLATFORM_POWERMAC)

       		copy_and_flush(0, KERNELBASE + offset, 0x100, 0);

arch/powerpc/kernel/setup_64.c

+3 −3
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void __init setup_cpu_maps(void) 
extern struct machdep_calls pSeries_md;

extern struct machdep_calls pmac_md;

extern struct machdep_calls maple_md;

extern struct machdep_calls bpa_md;

extern struct machdep_calls cell_md;

extern struct machdep_calls iseries_md;



/* Ultimately, stuff them in an elf section like initcalls... */
@@ -310,8 +310,8 @@ static struct machdep_calls __initdata *machines[] = { 
#ifdef CONFIG_PPC_MAPLE

	&maple_md,

#endif /* CONFIG_PPC_MAPLE */

#ifdef CONFIG_PPC_BPA

	&bpa_md,

#ifdef CONFIG_PPC_CELL

	&cell_md,

#endif

#ifdef CONFIG_PPC_ISERIES

	&iseries_md,

arch/powerpc/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ int die(const char *str, struct pt_regs *regs, long err) 
		printk("POWERMAC ");

		nl = 1;

		break;

	case PLATFORM_BPA:

		printk("BPA ");

	case PLATFORM_CELL:

		printk("CELL ");

		nl = 1;

		break;

	}

arch/ppc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ endif 


obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o



obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \

obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o bpa_nvram.o \

			 bpa_iic.o spider-pic.o



obj-$(CONFIG_KEXEC)		+= machine_kexec.o