aboutsummaryrefslogtreecommitdiff
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-03-30 09:30:15 -0400
committerTom Rini <trini@konsulko.com>2022-03-31 08:27:52 -0400
commitdd2986ac110e545208ce27aeb4f2e18ec118f6da (patch)
tree68af37f1212b601f44f43936bc23e1f580854a6a /arch/Kconfig
parent6a56fc0ab415423a0fb6f410d846d4b68806a238 (diff)
downloadu-boot-dd2986ac110e545208ce27aeb4f2e18ec118f6da.zip
u-boot-dd2986ac110e545208ce27aeb4f2e18ec118f6da.tar.gz
u-boot-dd2986ac110e545208ce27aeb4f2e18ec118f6da.tar.bz2
powerpc: Fix incorrect SYS_IMMR migration values
When migrating SYS_IMMR, I didn't allow for boards to provide non-default values here. This lead to an incorrect migration on the platforms where CONFIG_SYS_IMMR is set to CONFIG_SYS_CCSRBAR and CONFIG_SYS_CSSRBAR is NOT the same as CONFIG_SYS_CCSRBAR_DEFAULT. Add text to the prompt so that non-default values can be used and re-migrate the platforms that have CONFIG_SYS_IMMR=CONFIG_SYS_CSSRBAR where CONFIG_SYS_CSSRBAR != CONFIG_SYS_CCSRBAR_DEFAULT. Fixes: be7dbb60c5bf ("Convert CONFIG_SYS_IMMR to Kconfig") Reported-by: Pali Rohár <pali@kernel.org> Signed-off-by: Tom Rini <trini@konsulko.com> Tested-by: Pali Rohár <pali@kernel.org>
Diffstat (limited to 'arch/Kconfig')
-rw-r--r--arch/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index e619144..7ecb375 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -363,7 +363,7 @@ config SYS_DISABLE_DCACHE_OPS
this functionality.
config SYS_IMMR
- hex
+ hex "Address for the Internal Memory-Mapped Registers (IMMR) window"
depends on PPC || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A
default 0xFF000000 if MPC8xx
default 0xF0000000 if ARCH_MPC8313