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

Commit 968159c0 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/8xx: Getting rid of remaining use of CONFIG_8xx 



Two config options exist to define powerpc MPC8xx:
* CONFIG_PPC_8xx
* CONFIG_8xx

arch/powerpc/platforms/Kconfig.cputype has contained the following
comment about CONFIG_8xx item for some years:
"# this is temp to handle compat with arch=ppc"

arch/powerpc is now the only place with remaining use of
CONFIG_8xx: get rid of them.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e9599866

arch/powerpc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ config HUGETLB_PAGE_SIZE_VARIABLE 


config MATH_EMULATION

	bool "Math emulation"

	depends on 4xx || 8xx || PPC_MPC832x || BOOKE

	depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE

	---help---

	  Some PowerPC chips designed for embedded applications do not have

	  a floating-point unit and therefore do not implement the
@@ -967,7 +967,7 @@ config PPC_PCI_CHOICE 


config PCI

	bool "PCI support" if PPC_PCI_CHOICE

	default y if !40x && !CPM2 && !8xx && !PPC_83xx \

	default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON

	default PCI_QSPAN if PPC_8xx

	select GENERIC_PCI_IOMAP

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ KBUILD_AFLAGS += $(aflags-y) 
KBUILD_CFLAGS += $(cflags-y)



head-y				:= arch/powerpc/kernel/head_$(BITS).o

head-$(CONFIG_8xx)		:= arch/powerpc/kernel/head_8xx.o

head-$(CONFIG_PPC_8xx)		:= arch/powerpc/kernel/head_8xx.o

head-$(CONFIG_40x)		:= arch/powerpc/kernel/head_40x.o

head-$(CONFIG_44x)		:= arch/powerpc/kernel/head_44x.o

head-$(CONFIG_FSL_BOOKE)	:= arch/powerpc/kernel/head_fsl_booke.o

arch/powerpc/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ src-wlib-y += crtsavres.S 
endif

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_PPC_8xx) += mpc8xx.c planetcore.c fsl-soc.c

src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c

src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c
@@ -124,7 +124,7 @@ src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \ 
				treeboot-iss4xx.c treeboot-currituck.c \

				treeboot-akebono.c \

				simpleboot.c fixed-head.S virtex.c

src-plat-$(CONFIG_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c

src-plat-$(CONFIG_PPC_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c

src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c

src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c

src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c

arch/powerpc/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 




/* bytes per L1 cache line */

#if defined(CONFIG_8xx) || defined(CONFIG_403GCX)

#if defined(CONFIG_PPC_8xx) || defined(CONFIG_403GCX)

#define L1_CACHE_SHIFT		4

#define MAX_COPY_PREFETCH	1

#elif defined(CONFIG_PPC_E500MC)

arch/powerpc/include/asm/cputable.h

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ enum { 
#else

	    CPU_FTRS_GENERIC_32 |

#endif

#ifdef CONFIG_8xx

#ifdef CONFIG_PPC_8xx

	    CPU_FTRS_8XX |

#endif

#ifdef CONFIG_40x
@@ -565,7 +565,7 @@ enum { 
#else

	    CPU_FTRS_GENERIC_32 &

#endif

#ifdef CONFIG_8xx

#ifdef CONFIG_PPC_8xx

	    CPU_FTRS_8XX &

#endif

#ifdef CONFIG_40x