Hi

On 3/9/21 2:06 PM, Patrice CHOTARD wrote:

Hi Patrick

On 2/25/21 11:49 AM, Patrick Delaunay wrote:

...

Since commit d5d726d3cc47 ("configs: stm32mp1: only support SD card after NOR in bootcmd_stm32mp"), the stm32mp1 boards only support SD card after NOR boot device, so the MTD partitions for nand0 or spi-nand0 are useless (no need of "UBI" partition in nand0 or spi-nand0).

This patch removes these nand MTD update for nor boot and simplify nand0 and spi-nand0 support (remove the mtd_boot variable).

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com

---

board/st/common/stm32mp_mtdparts.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c index 69eb10844d..f074fc189d 100644 --- a/board/st/common/stm32mp_mtdparts.c +++ b/board/st/common/stm32mp_mtdparts.c @@ -122,28 +122,24 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts) log_debug("mtd device = %s\n", dev->name); }

• if (nor || nand) {

• if (nand) { mtd = get_mtd_device_nm("nand0"); if (!IS_ERR_OR_NULL(mtd)) {

• 	const char *mtd_boot = CONFIG_MTDPARTS_NAND0_BOOT;
  const char *mtd_tee = CONFIG_MTDPARTS_NAND0_TEE;
  

• board_set_mtdparts("nand0", ids, parts,
  

• 			   !nor ? mtd_boot : NULL,
  

• 			   CONFIG_MTDPARTS_NAND0_BOOT,
  		   !nor && tee ? mtd_tee : NULL,
  		   "-(UBI)");
  put_mtd_device(mtd);
  

  } }

• if (nor || spinand) {

• if (spinand) { mtd = get_mtd_device_nm("spi-nand0"); if (!IS_ERR_OR_NULL(mtd)) {

• 	const char *mtd_boot = CONFIG_MTDPARTS_SPINAND0_BOOT;
  const char *mtd_tee = CONFIG_MTDPARTS_SPINAND0_TEE;
  

• board_set_mtdparts("spi-nand0", ids, parts,
  

• 			   !nor ? mtd_boot : NULL,
  

• 			   CONFIG_MTDPARTS_SPINAND0_BOOT,
  		   !nor && tee ? mtd_tee : NULL,
  		   "-(UBI)");
  put_mtd_device(mtd);
  

@@ -152,11 +148,9 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)

if (nor) { if (!uclass_get_device(UCLASS_SPI_FLASH, 0, &dev)) {

• 	const char *mtd_boot = CONFIG_MTDPARTS_NOR0_BOOT;
  const char *mtd_tee = CONFIG_MTDPARTS_NOR0_TEE;
  

• board_set_mtdparts("nor0", ids, parts,
  

• 			   mtd_boot,
  

• 			   CONFIG_MTDPARTS_NOR0_BOOT,
  		   tee ? mtd_tee : NULL,
  		   "-(nor_user)");
  

  }

Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com

Thanks Patrice

Applied to u-boot-stm/next

Thanks

Patrice