Hi Marek On 10/24/21 12:46 AM, Marek Vasut wrote: > The DHSOM uses different SPI NOR layout than the ST devkit, stop > pulling in the ST specific runtime mtdparts settings and adjust > the mtdparts accordingly. > > Signed-off-by: Marek Vasut <ma...@denx.de> > Cc: Patrice Chotard <patrice.chot...@foss.st.com> > Cc: Patrick Delaunay <patrick.delau...@foss.st.com> > --- > board/dhelectronics/dh_stm32mp1/Makefile | 1 - > configs/stm32mp15_dhcom_basic_defconfig | 3 ++- > configs/stm32mp15_dhcor_basic_defconfig | 2 ++ > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/dhelectronics/dh_stm32mp1/Makefile > b/board/dhelectronics/dh_stm32mp1/Makefile > index b368b396a46..30db1dee807 100644 > --- a/board/dhelectronics/dh_stm32mp1/Makefile > +++ b/board/dhelectronics/dh_stm32mp1/Makefile > @@ -5,5 +5,4 @@ > > obj-y += ../../st/common/stpmic1.o board.o > > -obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += ../../st/common/stm32mp_mtdparts.o > obj-$(CONFIG_SET_DFU_ALT_INFO) += ../../st/common/stm32mp_dfu.o > diff --git a/configs/stm32mp15_dhcom_basic_defconfig > b/configs/stm32mp15_dhcom_basic_defconfig > index 5ecc91c7c1b..f51896ed472 100644 > --- a/configs/stm32mp15_dhcom_basic_defconfig > +++ b/configs/stm32mp15_dhcom_basic_defconfig > @@ -61,6 +61,8 @@ CONFIG_CMD_PMIC=y > CONFIG_CMD_REGULATOR=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_MTDPARTS=y > +CONFIG_MTDIDS_DEFAULT="nor0=nor0" > +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)" > # CONFIG_SPL_DOS_PARTITION is not set > # CONFIG_ISO_PARTITION is not set > # CONFIG_SPL_PARTITION_UUIDS is not set > @@ -102,7 +104,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y > CONFIG_STM32_SDMMC2=y > CONFIG_MTD=y > CONFIG_DM_MTD=y > -CONFIG_SYS_MTDPARTS_RUNTIME=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SF_DEFAULT_SPEED=50000000 > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > diff --git a/configs/stm32mp15_dhcor_basic_defconfig > b/configs/stm32mp15_dhcor_basic_defconfig > index 7c410b8224a..13e4553ac82 100644 > --- a/configs/stm32mp15_dhcor_basic_defconfig > +++ b/configs/stm32mp15_dhcor_basic_defconfig > @@ -59,6 +59,8 @@ CONFIG_CMD_PMIC=y > CONFIG_CMD_REGULATOR=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_MTDPARTS=y > +CONFIG_MTDIDS_DEFAULT="nor0=nor0" > +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)" > # CONFIG_SPL_DOS_PARTITION is not set > # CONFIG_ISO_PARTITION is not set > # CONFIG_SPL_PARTITION_UUIDS is not set > Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
Thanks Patrice
