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: be7dbb60c5 ("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>
This commit is contained in:
Tom Rini 2022-03-30 09:30:15 -04:00
parent 6a56fc0ab4
commit dd2986ac11
41 changed files with 41 additions and 1 deletions

View file

@ -363,7 +363,7 @@ config SYS_DISABLE_DCACHE_OPS
this functionality. this functionality.
config SYS_IMMR config SYS_IMMR
hex hex "Address for the Internal Memory-Mapped Registers (IMMR) window"
depends on PPC || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A depends on PPC || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A
default 0xFF000000 if MPC8xx default 0xFF000000 if MPC8xx
default 0xF0000000 if ARCH_MPC8313 default 0xF0000000 if ARCH_MPC8313

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xE0000000
CONFIG_SYS_TEXT_BASE=0xFFF80000 CONFIG_SYS_TEXT_BASE=0xFFF80000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xE0000000
CONFIG_SYS_TEXT_BASE=0xFFF80000 CONFIG_SYS_TEXT_BASE=0xFFF80000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xE0000000
CONFIG_SYS_TEXT_BASE=0xFFF80000 CONFIG_SYS_TEXT_BASE=0xFFF80000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0x11001000 CONFIG_SYS_TEXT_BASE=0x11001000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xFFE00000
CONFIG_SYS_TEXT_BASE=0xEFF40000 CONFIG_SYS_TEXT_BASE=0xEFF40000
CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000

View file

@ -1,4 +1,5 @@
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_SYS_IMMR=0xE0000000
CONFIG_SYS_TEXT_BASE=0xfff80000 CONFIG_SYS_TEXT_BASE=0xfff80000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000