leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd: mtdparts: add SYS_MTDPARTS_RUNTIME dependency on CONFIG_MTDIDS/MTDPARTS_DEFAULT

Browse Source 
The two configuration CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT
are not needed with mtd configuration CONFIG_SYS_MTDPARTS_RUNTIME which
allows the MTDIDS and MTDPARTS to be configured at runtime.

This patch has no defconfig impacts because CONFIG_SYS_MTDPARTS_RUNTIME
is only used by two platforms (stm32mp and igep00x0) which don't define
CONFIG_MTDIDS_DEFAULT or CONFIG_MTDPARTS_DEFAULT.

This patch solves an UBI environment load issue for NAND boot for
stm32mp15 platform. In mtd_uboot.c, when GD_FLG_ENV_READY is not set,
env_get_f() return a EMPTY string, define in default_environment[]
because CONFIG_MTDIDS_DEFAULT="" and CONFIG_MTDPARTS_DEFAULT="",
but a NULL pointer is expected to allow call of board_mtdparts_default.
Without mtdparts, the env partition [CONFIG_ENV_UBI_PART="UBI"] is not
found in env/ubi.c [CONFIG_ENV_IS_IN_UBI].

It is not a problem when env becomes ready, as these empty variables are
removed form U-Boot environment in env_import() / himport_r().

Fixes: a331017c23 ("Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment")
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Patrick Delaunay 2022-12-08 09:10:13 +01:00 committed by Tom Rini
parent dd02c66790
commit 6762c8dd89
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Kconfig
View File

@ -2539,6 +2539,7 @@ config CMD_MTDPARTS_SHOW_NET_SIZES
config MTDIDS_DEFAULT config MTDIDS_DEFAULT
string "Default MTD IDs" string "Default MTD IDs"
depends on MTD || SPI_FLASH depends on MTD || SPI_FLASH
depends on !SYS_MTDPARTS_RUNTIME
help help
Defines a default MTD IDs list for use with MTD partitions in the Defines a default MTD IDs list for use with MTD partitions in the
Linux MTD command line partitions format. Linux MTD command line partitions format.
@ -2546,6 +2547,7 @@ config MTDIDS_DEFAULT
config MTDPARTS_DEFAULT config MTDPARTS_DEFAULT
string "Default MTD partition scheme" string "Default MTD partition scheme"
depends on MTD || SPI_FLASH depends on MTD || SPI_FLASH
depends on !SYS_MTDPARTS_RUNTIME
help help
Defines a default MTD partitioning scheme in the Linux MTD command Defines a default MTD partitioning scheme in the Linux MTD command
line partitions format line partitions format