powerpc: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32
authorChristophe Leroy <christophe.leroy@c-s.fr>
Sat, 17 Nov 2018 10:24:56 +0000 (10:24 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Nov 2018 11:33:37 +0000 (22:33 +1100)
commitd7cceda96badc1bd444cff27ab9c375a1277c1e3
tree62238e4ef5640373dd821b3e9eaf1f68ab970d44
parentf99e33f12490d03e34e1b9cb1b3e3a8beff34ae5
powerpc: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32

Today we have:

config PPC_BOOK3S_32
bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
[depends on PPC32 within a choice]

config PPC_BOOK3S
def_bool y
depends on PPC_BOOK3S_32 || PPC_BOOK3S_64

config 6xx
def_bool y
depends on PPC32 && PPC_BOOK3S

6xx is therefore redundant with PPC_BOOK3S_32.

In order to make the code clearer, lets use preferably PPC_BOOK3S_32.
This will allow to remove CONFIG_6xx in a later patch.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
20 files changed:
arch/powerpc/Makefile
arch/powerpc/include/asm/cache.h
arch/powerpc/include/asm/mmu.h
arch/powerpc/include/asm/reg.h
arch/powerpc/include/asm/time.h
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/cpu_setup_6xx.S
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/head_32.S
arch/powerpc/kernel/misc_32.S
arch/powerpc/kernel/pmc.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/sysfs.c
arch/powerpc/mm/mmu_decl.h
arch/powerpc/oprofile/Makefile
arch/powerpc/oprofile/common.c
arch/powerpc/platforms/powermac/cache.S
arch/powerpc/platforms/powermac/feature.c
arch/powerpc/platforms/powermac/sleep.S
arch/powerpc/sysdev/Makefile