diff options
| author | Christophe Leroy | 2018-11-17 11:24:56 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2018-11-26 12:33:37 +0100 |
| commit | d7cceda96badc1bd444cff27ab9c375a1277c1e3 (patch) | |
| tree | 62238e4ef5640373dd821b3e9eaf1f68ab970d44 /arch/powerpc/kernel/Makefile | |
| parent | drivers/cpufreq: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32 (diff) | |
| download | kernel-qcow2-linux-d7cceda96badc1bd444cff27ab9c375a1277c1e3.tar.gz kernel-qcow2-linux-d7cceda96badc1bd444cff27ab9c375a1277c1e3.tar.xz kernel-qcow2-linux-d7cceda96badc1bd444cff27ab9c375a1277c1e3.zip | |
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>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 53d4b8d5b54d..a5a6a243f3cf 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_FA_DUMP) += fadump.o ifdef CONFIG_PPC32 obj-$(CONFIG_E500) += idle_e500.o endif -obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o +obj-$(CONFIG_PPC_BOOK3S_32) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o ifdef CONFIG_FSL_BOOKE |