diff options
author | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2022-12-08 11:10:13 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-01-11 19:54:50 +0300 |
commit | 6762c8dd890f1e0b70822bd9b59a9003476dad2e (patch) | |
tree | 50afe1bb03e8983e2ce6b9767bf42b8aef43b1d9 /cmd | |
parent | dd02c667906d89ff46b79898de12ae8db9aceb6f (diff) | |
download | u-boot-6762c8dd890f1e0b70822bd9b59a9003476dad2e.tar.xz |
cmd: mtdparts: add SYS_MTDPARTS_RUNTIME dependency on CONFIG_MTDIDS/MTDPARTS_DEFAULT
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: a331017c237c ("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>
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 199a55383e..b2aefae9cb 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2539,6 +2539,7 @@ config CMD_MTDPARTS_SHOW_NET_SIZES config MTDIDS_DEFAULT string "Default MTD IDs" depends on MTD || SPI_FLASH + depends on !SYS_MTDPARTS_RUNTIME help Defines a default MTD IDs list for use with MTD partitions in the Linux MTD command line partitions format. @@ -2546,6 +2547,7 @@ config MTDIDS_DEFAULT config MTDPARTS_DEFAULT string "Default MTD partition scheme" depends on MTD || SPI_FLASH + depends on !SYS_MTDPARTS_RUNTIME help Defines a default MTD partitioning scheme in the Linux MTD command line partitions format |