leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2017-08-08 13:58:54 +02:00 committed by Michael Ellerman
parent e959986694
commit 968159c003
20 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/Kconfig
View File

@ -405,7 +405,7 @@ config HUGETLB_PAGE_SIZE_VARIABLE
config MATH_EMULATION config MATH_EMULATION
bool "Math emulation" bool "Math emulation"
depends on 4xx || 8xx || PPC_MPC832x || BOOKE depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE
---help--- ---help---
Some PowerPC chips designed for embedded applications do not have Some PowerPC chips designed for embedded applications do not have
a floating-point unit and therefore do not implement the a floating-point unit and therefore do not implement the
@ -967,7 +967,7 @@ config PPC_PCI_CHOICE
config PCI config PCI
bool "PCI support" if PPC_PCI_CHOICE 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 && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
default PCI_QSPAN if PPC_8xx default PCI_QSPAN if PPC_8xx
select GENERIC_PCI_IOMAP select GENERIC_PCI_IOMAP

2
arch/powerpc/Makefile
View File

@ -249,7 +249,7 @@ KBUILD_AFLAGS += $(aflags-y)
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
head-y := arch/powerpc/kernel/head_$(BITS).o 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_40x) := arch/powerpc/kernel/head_40x.o
head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o
head-$(CONFIG_FSL_BOOKE) := arch/powerpc/kernel/head_fsl_booke.o head-$(CONFIG_FSL_BOOKE) := arch/powerpc/kernel/head_fsl_booke.o

4
arch/powerpc/boot/Makefile
View File

@ -107,7 +107,7 @@ src-wlib-y += crtsavres.S
endif endif
src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c
src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.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_PPC_82xx) += pq2.c fsl-soc.c planetcore.c
src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.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-iss4xx.c treeboot-currituck.c \
treeboot-akebono.c \ treeboot-akebono.c \
simpleboot.c fixed-head.S virtex.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_MPC52xx) += cuboot-52xx.c
src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.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 src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c

2
arch/powerpc/include/asm/cache.h
View File

@ -5,7 +5,7 @@
/* bytes per L1 cache line */ /* 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 L1_CACHE_SHIFT 4
#define MAX_COPY_PREFETCH 1 #define MAX_COPY_PREFETCH 1
#elif defined(CONFIG_PPC_E500MC) #elif defined(CONFIG_PPC_E500MC)

4
arch/powerpc/include/asm/cputable.h
View File

@ -513,7 +513,7 @@ enum {
#else #else
CPU_FTRS_GENERIC_32 | CPU_FTRS_GENERIC_32 |
#endif #endif
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
CPU_FTRS_8XX | CPU_FTRS_8XX |
#endif #endif
#ifdef CONFIG_40x #ifdef CONFIG_40x
@ -565,7 +565,7 @@ enum {
#else #else
CPU_FTRS_GENERIC_32 & CPU_FTRS_GENERIC_32 &
#endif #endif
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
CPU_FTRS_8XX & CPU_FTRS_8XX &
#endif #endif
#ifdef CONFIG_40x #ifdef CONFIG_40x

2
arch/powerpc/include/asm/fs_pd.h
View File

@ -26,7 +26,7 @@
#define cpm2_unmap(addr) do {} while(0) #define cpm2_unmap(addr) do {} while(0)
#endif #endif
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
#include <asm/8xx_immap.h> #include <asm/8xx_immap.h>
extern immap_t __iomem *mpc8xx_immr; extern immap_t __iomem *mpc8xx_immr;

2
arch/powerpc/include/asm/nohash/32/pgtable.h
View File

@ -121,7 +121,7 @@ extern int icache_44x_need_flush;
#include <asm/nohash/pte-book3e.h> #include <asm/nohash/pte-book3e.h>
#elif defined(CONFIG_FSL_BOOKE) #elif defined(CONFIG_FSL_BOOKE)
#include <asm/nohash/32/pte-fsl-booke.h> #include <asm/nohash/32/pte-fsl-booke.h>
#elif defined(CONFIG_8xx) #elif defined(CONFIG_PPC_8xx)
#include <asm/nohash/32/pte-8xx.h> #include <asm/nohash/32/pte-8xx.h>
#endif #endif

2
arch/powerpc/include/asm/ppc_asm.h
View File

@ -417,7 +417,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
* and they must be used. * and they must be used.
*/ */
#if !defined(CONFIG_4xx) && !defined(CONFIG_8xx) #if !defined(CONFIG_4xx) && !defined(CONFIG_PPC_8xx)
#define tlbia \ #define tlbia \
li r4,1024; \ li r4,1024; \
mtctr r4; \ mtctr r4; \

10
arch/powerpc/include/asm/reg.h
View File

@ -22,9 +22,9 @@
#include <asm/reg_fsl_emb.h> #include <asm/reg_fsl_emb.h>
#endif #endif
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
#include <asm/reg_8xx.h> #include <asm/reg_8xx.h>
#endif /* CONFIG_8xx */ #endif /* CONFIG_PPC_8xx */
#define MSR_SF_LG 63 /* Enable 64 bit mode */ #define MSR_SF_LG 63 /* Enable 64 bit mode */
#define MSR_ISF_LG 61 /* Interrupt 64b mode valid on 630 */ #define MSR_ISF_LG 61 /* Interrupt 64b mode valid on 630 */
@ -135,7 +135,7 @@
#define MSR_KERNEL (MSR_ | MSR_64BIT) #define MSR_KERNEL (MSR_ | MSR_64BIT)
#define MSR_USER32 (MSR_ | MSR_PR | MSR_EE) #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE)
#define MSR_USER64 (MSR_USER32 | MSR_64BIT) #define MSR_USER64 (MSR_USER32 | MSR_64BIT)
#elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx) #elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_PPC_8xx)
/* Default MSR for kernel mode. */ /* Default MSR for kernel mode. */
#define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR) #define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR)
#define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE) #define MSR_USER (MSR_KERNEL|MSR_PR|MSR_EE)
@ -1164,7 +1164,7 @@
#endif #endif
#endif #endif
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
#define SPRN_SPRG_SCRATCH0 SPRN_SPRG0 #define SPRN_SPRG_SCRATCH0 SPRN_SPRG0
#define SPRN_SPRG_SCRATCH1 SPRN_SPRG1 #define SPRN_SPRG_SCRATCH1 SPRN_SPRG1
#define SPRN_SPRG_SCRATCH2 SPRN_SPRG2 #define SPRN_SPRG_SCRATCH2 SPRN_SPRG2
@ -1363,7 +1363,7 @@ static inline void msr_check_and_clear(unsigned long bits)
#else /* __powerpc64__ */ #else /* __powerpc64__ */
#if defined(CONFIG_8xx) #if defined(CONFIG_PPC_8xx)
#define mftbl() ({unsigned long rval; \ #define mftbl() ({unsigned long rval; \
asm volatile("mftbl %0" : "=r" (rval)); rval;}) asm volatile("mftbl %0" : "=r" (rval)); rval;})
#define mftbu() ({unsigned long rval; \ #define mftbu() ({unsigned long rval; \

2
arch/powerpc/include/asm/timex.h
View File

@ -29,7 +29,7 @@ static inline cycles_t get_cycles(void)
ret = 0; ret = 0;
__asm__ __volatile__( __asm__ __volatile__(
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
"97: mftb %0\n" "97: mftb %0\n"
#else #else
"97: mfspr %0, %2\n" "97: mfspr %0, %2\n"

2
arch/powerpc/kernel/Makefile
View File

@ -83,7 +83,7 @@ extra-y := head_$(BITS).o
extra-$(CONFIG_40x) := head_40x.o extra-$(CONFIG_40x) := head_40x.o
extra-$(CONFIG_44x) := head_44x.o extra-$(CONFIG_44x) := head_44x.o
extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
extra-$(CONFIG_8xx) := head_8xx.o extra-$(CONFIG_PPC_8xx) := head_8xx.o
extra-y += vmlinux.lds extra-y += vmlinux.lds
obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o

4
arch/powerpc/kernel/cputable.c
View File

@ -1259,7 +1259,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.platform = "ppc603", .platform = "ppc603",
}, },
#endif /* CONFIG_PPC_BOOK3S_32 */ #endif /* CONFIG_PPC_BOOK3S_32 */
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
{ /* 8xx */ { /* 8xx */
.pvr_mask = 0xffff0000, .pvr_mask = 0xffff0000,
.pvr_value = 0x00500000, .pvr_value = 0x00500000,
@ -1274,7 +1274,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
.machine_check = machine_check_8xx, .machine_check = machine_check_8xx,
.platform = "ppc823", .platform = "ppc823",
}, },
#endif /* CONFIG_8xx */ #endif /* CONFIG_PPC_8xx */
#ifdef CONFIG_40x #ifdef CONFIG_40x
{ /* 403GC */ { /* 403GC */
.pvr_mask = 0xffffff00, .pvr_mask = 0xffffff00,

2
arch/powerpc/kernel/irq.c
View File

@ -24,7 +24,7 @@
* mask register (of which only 16 are defined), hence the weird shifting * mask register (of which only 16 are defined), hence the weird shifting
* and complement of the cached_irq_mask. I want to be able to stuff * and complement of the cached_irq_mask. I want to be able to stuff
* this right into the SIU SMASK register. * this right into the SIU SMASK register.
* Many of the prep/chrp functions are conditional compiled on CONFIG_8xx * Many of the prep/chrp functions are conditional compiled on CONFIG_PPC_8xx
* to reduce code space and undefined function references. * to reduce code space and undefined function references.
*/ */

4
arch/powerpc/kernel/kgdb.c
View File

@ -67,9 +67,9 @@ static struct hard_trap_info
#endif #endif
#else /* ! (defined(CONFIG_40x) || defined(CONFIG_BOOKE)) */ #else /* ! (defined(CONFIG_40x) || defined(CONFIG_BOOKE)) */
{ 0x0d00, 0x05 /* SIGTRAP */ }, /* single-step */ { 0x0d00, 0x05 /* SIGTRAP */ }, /* single-step */
#if defined(CONFIG_8xx) #if defined(CONFIG_PPC_8xx)
{ 0x1000, 0x04 /* SIGILL */ }, /* software emulation */ { 0x1000, 0x04 /* SIGILL */ }, /* software emulation */
#else /* ! CONFIG_8xx */ #else /* ! CONFIG_PPC_8xx */
{ 0x0f00, 0x04 /* SIGILL */ }, /* performance monitor */ { 0x0f00, 0x04 /* SIGILL */ }, /* performance monitor */
{ 0x0f20, 0x08 /* SIGFPE */ }, /* altivec unavailable */ { 0x0f20, 0x08 /* SIGFPE */ }, /* altivec unavailable */
{ 0x1300, 0x05 /* SIGTRAP */ }, /* instruction address break */ { 0x1300, 0x05 /* SIGTRAP */ }, /* instruction address break */

2
arch/powerpc/mm/fault.c
View File

@ -353,7 +353,7 @@ static void sanity_check_fault(bool is_write, unsigned long error_code) { }
#define page_fault_is_bad(__err) (0) #define page_fault_is_bad(__err) (0)
#else #else
#define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE) #define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE)
#if defined(CONFIG_8xx) #if defined(CONFIG_PPC_8xx)
#define page_fault_is_bad(__err) ((__err) & 0x10000000) #define page_fault_is_bad(__err) ((__err) & 0x10000000)
#elif defined(CONFIG_PPC64) #elif defined(CONFIG_PPC64)
#define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S) #define page_fault_is_bad(__err) ((__err) & DSISR_BAD_FAULT_64S)

2
arch/powerpc/mm/mem.c
View File

@ -436,7 +436,7 @@ void flush_dcache_icache_page(struct page *page)
return; return;
} }
#endif #endif
#if defined(CONFIG_8xx) || defined(CONFIG_PPC64) #if defined(CONFIG_PPC_8xx) || defined(CONFIG_PPC64)
/* On 8xx there is no need to kmap since highmem is not supported */ /* On 8xx there is no need to kmap since highmem is not supported */
__flush_dcache_icache(page_address(page)); __flush_dcache_icache(page_address(page));
#else #else

10
arch/powerpc/mm/mmu_decl.h
View File

@ -27,7 +27,7 @@
/* /*
* On 40x and 8xx, we directly inline tlbia and tlbivax * On 40x and 8xx, we directly inline tlbia and tlbivax
*/ */
#if defined(CONFIG_40x) || defined(CONFIG_8xx) #if defined(CONFIG_40x) || defined(CONFIG_PPC_8xx)
static inline void _tlbil_all(void) static inline void _tlbil_all(void)
{ {
asm volatile ("sync; tlbia; isync" : : : "memory"); asm volatile ("sync; tlbia; isync" : : : "memory");
@ -38,7 +38,7 @@ static inline void _tlbil_pid(unsigned int pid)
} }
#define _tlbil_pid_noind(pid) _tlbil_pid(pid) #define _tlbil_pid_noind(pid) _tlbil_pid(pid)
#else /* CONFIG_40x || CONFIG_8xx */ #else /* CONFIG_40x || CONFIG_PPC_8xx */
extern void _tlbil_all(void); extern void _tlbil_all(void);
extern void _tlbil_pid(unsigned int pid); extern void _tlbil_pid(unsigned int pid);
#ifdef CONFIG_PPC_BOOK3E #ifdef CONFIG_PPC_BOOK3E
@ -46,12 +46,12 @@ extern void _tlbil_pid_noind(unsigned int pid);
#else #else
#define _tlbil_pid_noind(pid) _tlbil_pid(pid) #define _tlbil_pid_noind(pid) _tlbil_pid(pid)
#endif #endif
#endif /* !(CONFIG_40x || CONFIG_8xx) */ #endif /* !(CONFIG_40x || CONFIG_PPC_8xx) */
/* /*
* On 8xx, we directly inline tlbie, on others, it's extern * On 8xx, we directly inline tlbie, on others, it's extern
*/ */
#ifdef CONFIG_8xx #ifdef CONFIG_PPC_8xx
static inline void _tlbil_va(unsigned long address, unsigned int pid, static inline void _tlbil_va(unsigned long address, unsigned int pid,
unsigned int tsize, unsigned int ind) unsigned int tsize, unsigned int ind)
{ {
@ -67,7 +67,7 @@ static inline void _tlbil_va(unsigned long address, unsigned int pid,
{ {
__tlbil_va(address, pid); __tlbil_va(address, pid);
} }
#endif /* CONFIG_8xx */ #endif /* CONFIG_PPC_8xx */
#if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x) #if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x)
extern void _tlbivax_bcast(unsigned long address, unsigned int pid, extern void _tlbivax_bcast(unsigned long address, unsigned int pid,

2
arch/powerpc/mm/tlb_nohash_low.S
View File

@ -60,7 +60,7 @@ _GLOBAL(__tlbil_va)
isync isync
1: blr 1: blr
#elif defined(CONFIG_8xx) #elif defined(CONFIG_PPC_8xx)
/* /*
* Nothing to do for 8xx, everything is inline * Nothing to do for 8xx, everything is inline

1
arch/powerpc/platforms/8xx/Kconfig
View File

@ -5,7 +5,6 @@ config CPM1
choice choice
prompt "8xx Machine Type" prompt "8xx Machine Type"
depends on PPC_8xx depends on PPC_8xx
depends on 8xx
default MPC885ADS default MPC885ADS
config MPC8XXFADS config MPC8XXFADS

2
arch/powerpc/platforms/Kconfig.cputype
View File

@ -375,7 +375,7 @@ config NR_CPUS
config NOT_COHERENT_CACHE config NOT_COHERENT_CACHE
bool bool
depends on 4xx || 8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON depends on 4xx || PPC_8xx || E200 || PPC_MPC512x || GAMECUBE_COMMON
default n if PPC_47x default n if PPC_47x
default y default y