On Wednesday 30 March 2022 09:30:15 Tom Rini wrote:
> 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 <p...@kernel.org>
> Signed-off-by: Tom Rini <tr...@konsulko.com>
For P2020RDB-PC_SDCARD_defconfig:
Tested-by: Pali Rohár <p...@kernel.org>
> ---
> arch/Kconfig | 2 +-
> configs/MPC8548CDS_36BIT_defconfig | 1 +
> configs/MPC8548CDS_defconfig | 1 +
> configs/MPC8548CDS_legacy_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_NOR_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 +
> configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PA_NAND_defconfig | 1 +
> configs/P1010RDB-PA_NOR_defconfig | 1 +
> configs/P1010RDB-PA_SDCARD_defconfig | 1 +
> configs/P1010RDB-PA_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_NOR_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 +
> configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1010RDB-PB_NAND_defconfig | 1 +
> configs/P1010RDB-PB_NOR_defconfig | 1 +
> configs/P1010RDB-PB_SDCARD_defconfig | 1 +
> configs/P1010RDB-PB_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_36BIT_defconfig | 1 +
> configs/P1020RDB-PC_NAND_defconfig | 1 +
> configs/P1020RDB-PC_SDCARD_defconfig | 1 +
> configs/P1020RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PC_defconfig | 1 +
> configs/P1020RDB-PD_NAND_defconfig | 1 +
> configs/P1020RDB-PD_SDCARD_defconfig | 1 +
> configs/P1020RDB-PD_SPIFLASH_defconfig | 1 +
> configs/P1020RDB-PD_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_36BIT_defconfig | 1 +
> configs/P2020RDB-PC_NAND_defconfig | 1 +
> configs/P2020RDB-PC_SDCARD_defconfig | 1 +
> configs/P2020RDB-PC_SPIFLASH_defconfig | 1 +
> configs/P2020RDB-PC_defconfig | 1 +
> configs/socrates_defconfig | 1 +
> 41 files changed, 41 insertions(+), 1 deletion(-)
>
> diff --git a/arch/Kconfig b/arch/Kconfig
> index e6191446a357..7ecb375b6b5a 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
> diff --git a/configs/MPC8548CDS_36BIT_defconfig
> b/configs/MPC8548CDS_36BIT_defconfig
> index d6351d5b11b9..240c6bec3758 100644
> --- a/configs/MPC8548CDS_36BIT_defconfig
> +++ b/configs/MPC8548CDS_36BIT_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xE0000000
> CONFIG_SYS_TEXT_BASE=0xFFF80000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
> index da0b80b09d7b..434ab0939b0b 100644
> --- a/configs/MPC8548CDS_defconfig
> +++ b/configs/MPC8548CDS_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xE0000000
> CONFIG_SYS_TEXT_BASE=0xFFF80000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/MPC8548CDS_legacy_defconfig
> b/configs/MPC8548CDS_legacy_defconfig
> index 87d1fd716c95..eb8233dfd67e 100644
> --- a/configs/MPC8548CDS_legacy_defconfig
> +++ b/configs/MPC8548CDS_legacy_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xE0000000
> CONFIG_SYS_TEXT_BASE=0xFFF80000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig
> b/configs/P1010RDB-PA_36BIT_NAND_defconfig
> index 61fd2a78a4e3..314d73a8ae1e 100644
> --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig
> b/configs/P1010RDB-PA_36BIT_NOR_defconfig
> index 0e537ebb5213..ebfb9c43f7ae 100644
> --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> index dc113be28d90..ca149b0b26d4 100644
> --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> index cd5c80c6346c..0d1f1568e2d6 100644
> --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PA_NAND_defconfig
> b/configs/P1010RDB-PA_NAND_defconfig
> index f80a0d929c13..fde12ea861b6 100644
> --- a/configs/P1010RDB-PA_NAND_defconfig
> +++ b/configs/P1010RDB-PA_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1010RDB-PA_NOR_defconfig
> b/configs/P1010RDB-PA_NOR_defconfig
> index 035aac226bb5..eeda2dd4cd50 100644
> --- a/configs/P1010RDB-PA_NOR_defconfig
> +++ b/configs/P1010RDB-PA_NOR_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1010RDB-PA_SDCARD_defconfig
> b/configs/P1010RDB-PA_SDCARD_defconfig
> index cd031d218c38..0032f2779099 100644
> --- a/configs/P1010RDB-PA_SDCARD_defconfig
> +++ b/configs/P1010RDB-PA_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig
> b/configs/P1010RDB-PA_SPIFLASH_defconfig
> index f339502637b7..e40cd4f93d01 100644
> --- a/configs/P1010RDB-PA_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig
> b/configs/P1010RDB-PB_36BIT_NAND_defconfig
> index ba64f8818fb8..f6dfc16edef3 100644
> --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig
> b/configs/P1010RDB-PB_36BIT_NOR_defconfig
> index a8e95568714d..acaba8539b77 100644
> --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> index 871996711db3..6a346fba2ac2 100644
> --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> index 2d646f9f54d9..5e31d18a5f8f 100644
> --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PB_NAND_defconfig
> b/configs/P1010RDB-PB_NAND_defconfig
> index f8437ff032f9..be614b85b725 100644
> --- a/configs/P1010RDB-PB_NAND_defconfig
> +++ b/configs/P1010RDB-PB_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1010RDB-PB_NOR_defconfig
> b/configs/P1010RDB-PB_NOR_defconfig
> index b99531c4cd90..261ca79c7aea 100644
> --- a/configs/P1010RDB-PB_NOR_defconfig
> +++ b/configs/P1010RDB-PB_NOR_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1010RDB-PB_SDCARD_defconfig
> b/configs/P1010RDB-PB_SDCARD_defconfig
> index ebe2af6f4a1d..e102207afff3 100644
> --- a/configs/P1010RDB-PB_SDCARD_defconfig
> +++ b/configs/P1010RDB-PB_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig
> b/configs/P1010RDB-PB_SPIFLASH_defconfig
> index 7893782fa445..52dfbbaae3ac 100644
> --- a/configs/P1010RDB-PB_SPIFLASH_defconfig
> +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig
> b/configs/P1020RDB-PC_36BIT_NAND_defconfig
> index 30b841d691bd..a8bc420f638e 100644
> --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> index 79edbf388d49..e9ee3cfdb110 100644
> --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> index c5a64de98e08..3f5a7cee0e22 100644
> --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PC_36BIT_defconfig
> b/configs/P1020RDB-PC_36BIT_defconfig
> index 9671a6d33008..6b3685bc365c 100644
> --- a/configs/P1020RDB-PC_36BIT_defconfig
> +++ b/configs/P1020RDB-PC_36BIT_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1020RDB-PC_NAND_defconfig
> b/configs/P1020RDB-PC_NAND_defconfig
> index 0201c51a5d0d..3a41738eede4 100644
> --- a/configs/P1020RDB-PC_NAND_defconfig
> +++ b/configs/P1020RDB-PC_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P1020RDB-PC_SDCARD_defconfig
> b/configs/P1020RDB-PC_SDCARD_defconfig
> index 371a8b5f8b84..395f0b2d8914 100644
> --- a/configs/P1020RDB-PC_SDCARD_defconfig
> +++ b/configs/P1020RDB-PC_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig
> b/configs/P1020RDB-PC_SPIFLASH_defconfig
> index 7c8b3c826cd0..5269c39ce98f 100644
> --- a/configs/P1020RDB-PC_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
> index 01b4fd363c40..dbe90e785be7 100644
> --- a/configs/P1020RDB-PC_defconfig
> +++ b/configs/P1020RDB-PC_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P1020RDB-PD_NAND_defconfig
> b/configs/P1020RDB-PD_NAND_defconfig
> index e70c1a7cbae6..bc277c600d01 100644
> --- a/configs/P1020RDB-PD_NAND_defconfig
> +++ b/configs/P1020RDB-PD_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x20000
> diff --git a/configs/P1020RDB-PD_SDCARD_defconfig
> b/configs/P1020RDB-PD_SDCARD_defconfig
> index 2596b5255d35..ed6b3393c27a 100644
> --- a/configs/P1020RDB-PD_SDCARD_defconfig
> +++ b/configs/P1020RDB-PD_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig
> b/configs/P1020RDB-PD_SPIFLASH_defconfig
> index f6f8888c82a7..7cad6ce45240 100644
> --- a/configs/P1020RDB-PD_SPIFLASH_defconfig
> +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
> index e1a4965caae5..ccf251478f7d 100644
> --- a/configs/P1020RDB-PD_defconfig
> +++ b/configs/P1020RDB-PD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig
> b/configs/P2020RDB-PC_36BIT_NAND_defconfig
> index 2c302b682168..3f3d30f2f132 100644
> --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> index 2d080713e7a2..3acb251e1e0d 100644
> --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> index 7b53b0251711..e545c294e09a 100644
> --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P2020RDB-PC_36BIT_defconfig
> b/configs/P2020RDB-PC_36BIT_defconfig
> index 5e8a474c905a..4c120e5722b6 100644
> --- a/configs/P2020RDB-PC_36BIT_defconfig
> +++ b/configs/P2020RDB-PC_36BIT_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/P2020RDB-PC_NAND_defconfig
> b/configs/P2020RDB-PC_NAND_defconfig
> index 74165dc60aa7..73e8a5c5714c 100644
> --- a/configs/P2020RDB-PC_NAND_defconfig
> +++ b/configs/P2020RDB-PC_NAND_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x4000
> diff --git a/configs/P2020RDB-PC_SDCARD_defconfig
> b/configs/P2020RDB-PC_SDCARD_defconfig
> index 0505f40a8148..614ff521b90e 100644
> --- a/configs/P2020RDB-PC_SDCARD_defconfig
> +++ b/configs/P2020RDB-PC_SDCARD_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig
> b/configs/P2020RDB-PC_SPIFLASH_defconfig
> index f1085fde4702..325a238fbfab 100644
> --- a/configs/P2020RDB-PC_SPIFLASH_defconfig
> +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0x11001000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
> index f933ed42fced..15f2a97df2d1 100644
> --- a/configs/P2020RDB-PC_defconfig
> +++ b/configs/P2020RDB-PC_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xFFE00000
> CONFIG_SYS_TEXT_BASE=0xEFF40000
> CONFIG_SYS_MALLOC_LEN=0x100000
> CONFIG_ENV_SIZE=0x2000
> diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
> index bad08e79c9f4..f9815ca581f1 100644
> --- a/configs/socrates_defconfig
> +++ b/configs/socrates_defconfig
> @@ -1,4 +1,5 @@
> CONFIG_PPC=y
> +CONFIG_SYS_IMMR=0xE0000000
> CONFIG_SYS_TEXT_BASE=0xfff80000
> CONFIG_ENV_SIZE=0x4000
> CONFIG_ENV_SECT_SIZE=0x20000
> --
> 2.25.1
>
