Commit 73d11498 authored Sep 19, 2022 by Christophe Leroy Committed by Michael Ellerman Sep 26, 2022

powerpc: Simplify redundant Kconfig tests



PPC_85xx implies PPC32 so no need to check PPC32 in addition.

PPC64 && !PPC_BOOK3E_64 means PPC_BOOK3S_64.

PPC_BOOK3E_64 implies PPC_E500.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/244cce3e603f2b79796314c0c1c46cab927b9adc.1663606876.git.christophe.leroy@csgroup.eu

parent 772fd56d

arch/powerpc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -606,7 +606,7 @@ config RELOCATABLE

		config RANDOMIZE_BASE
		bool "Randomize the address of the kernel image"
		depends on (PPC_85xx && FLATMEM && PPC32)
		depends on PPC_85xx && FLATMEM
		depends on RELOCATABLE
		help
		Randomizes the virtual address at which the kernel image is

arch/powerpc/platforms/Kconfig.cputype

+1 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ config 4xx

		config BOOKE
		bool
		depends on PPC_E500 \|\| 44x \|\| PPC_BOOK3E_64
		depends on PPC_E500 \|\| 44x
		default y

		config BOOKE_OR_40x

arch/powerpc/xmon/xmon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ Commands:\n\
		t print backtrace\n\
		x exit monitor and recover\n\
		X exit monitor and don't recover\n"
		#if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_BOOK3E_64)
		#if defined(CONFIG_PPC_BOOK3S_64)
		" u dump segment table or SLB\n"
		#elif defined(CONFIG_PPC_BOOK3S_32)
		" u dump segment registers\n"