Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: Fix incorrect SYS_IMMR migration values

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/Kconfig
View file

@ -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

1
configs/MPC8548CDS_36BIT_defconfig
View file

@ -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

1
configs/MPC8548CDS_defconfig
View file

@ -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

1
configs/MPC8548CDS_legacy_defconfig
View file

@ -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

1
configs/P1010RDB-PA_36BIT_NAND_defconfig
View file

@ -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

1
configs/P1010RDB-PA_36BIT_NOR_defconfig
View file

@ -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

1
configs/P1010RDB-PA_36BIT_SDCARD_defconfig
View file

@ -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

1
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
View file

@ -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

1
configs/P1010RDB-PA_NAND_defconfig
View file

@ -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

1
configs/P1010RDB-PA_NOR_defconfig
View file

@ -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

1
configs/P1010RDB-PA_SDCARD_defconfig
View file

@ -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

1
configs/P1010RDB-PA_SPIFLASH_defconfig
View file

@ -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

1
configs/P1010RDB-PB_36BIT_NAND_defconfig
View file

@ -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

1
configs/P1010RDB-PB_36BIT_NOR_defconfig
View file

@ -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

1
configs/P1010RDB-PB_36BIT_SDCARD_defconfig
View file

@ -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

1
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
View file

@ -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

1
configs/P1010RDB-PB_NAND_defconfig
View file

@ -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

1
configs/P1010RDB-PB_NOR_defconfig
View file

@ -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

1
configs/P1010RDB-PB_SDCARD_defconfig
View file

@ -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

1
configs/P1010RDB-PB_SPIFLASH_defconfig
View file

@ -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

1
configs/P1020RDB-PC_36BIT_NAND_defconfig
View file

@ -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

1
configs/P1020RDB-PC_36BIT_SDCARD_defconfig
View file

@ -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

1
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
View file

@ -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

1
configs/P1020RDB-PC_36BIT_defconfig
View file

@ -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

1
configs/P1020RDB-PC_NAND_defconfig
View file

@ -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

1
configs/P1020RDB-PC_SDCARD_defconfig
View file

@ -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

1
configs/P1020RDB-PC_SPIFLASH_defconfig
View file

@ -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

1
configs/P1020RDB-PC_defconfig
View file

@ -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

1
configs/P1020RDB-PD_NAND_defconfig
View file

@ -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

1
configs/P1020RDB-PD_SDCARD_defconfig
View file

@ -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

1
configs/P1020RDB-PD_SPIFLASH_defconfig
View file

@ -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

1
configs/P1020RDB-PD_defconfig
View file

@ -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

1
configs/P2020RDB-PC_36BIT_NAND_defconfig
View file

@ -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

1
configs/P2020RDB-PC_36BIT_SDCARD_defconfig
View file

@ -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

1
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
View file

@ -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

1
configs/P2020RDB-PC_36BIT_defconfig
View file

@ -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

1
configs/P2020RDB-PC_NAND_defconfig
View file

@ -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

1
configs/P2020RDB-PC_SDCARD_defconfig
View file

@ -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

1
configs/P2020RDB-PC_SPIFLASH_defconfig
View file

@ -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

1
configs/P2020RDB-PC_defconfig
View file

@ -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

1
configs/socrates_defconfig
View file

@ -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