| Message ID | 20220920160436.117811-7-patrice.chotard@foss.st.com |
|---|---|
| State | Accepted |
| Commit | 3cc471d30a1f7b47f0c9d2bd9874097d4b226659 |
| Delegated to: | Patrick Delaunay |
| Headers | show |
| Series | SPL fixes for STM32F7 MCUs | expand |
Hi, On 9/20/22 18:04, Patrice Chotard wrote: > arch-stm32f7/stm32.h file is shared between STM32F746 and STM32F769 > MCUs. But STM32F769 embeds 2MB of internal flash instead of 1MB for > STM32F746. The flash layout is quite similar between the 2 SoCs : > > STM32F746 STM32F769 > 4 * 32KB sectors 4 * 32KB sectors > 1 * 128KB sector 1 * 128KB sector > 3 * 256KB sectors 7 * 256KB sectors > > Update sect_sz_kb[] structure and SYS_MAX_FLASH_SECT accordingly. > > Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> > > --- > > Changes in v2: > - Remove SYS_UBOOT_FLAG from stm32f746-disco.h > > arch/arm/include/asm/arch-stm32f7/stm32.h | 6 +++--- > configs/stm32f769-disco_defconfig | 2 +- > configs/stm32f769-disco_spl_defconfig | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h > index 3451e74a3d..57db839e8d 100644 > --- a/arch/arm/include/asm/arch-stm32f7/stm32.h > +++ b/arch/arm/include/asm/arch-stm32f7/stm32.h > @@ -10,9 +10,9 @@ > #include <asm/arch-stm32/stm32f.h> > > static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = { > - [0 ... 3] = 32 * 1024, > - [4] = 128 * 1024, > - [5 ... 7] = 256 * 1024 > + [0 ... 3] = 32 * 1024, > + [4] = 128 * 1024, > + [5 ... CONFIG_SYS_MAX_FLASH_SECT - 1] = 256 * 1024 > }; > > #endif /* _ASM_ARCH_HARDWARE_H */ > diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig > index 423af7446a..5b5307ca1d 100644 > --- a/configs/stm32f769-disco_defconfig > +++ b/configs/stm32f769-disco_defconfig > @@ -41,7 +41,7 @@ CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_MTD_NOR_FLASH=y > CONFIG_STM32_FLASH=y > -CONFIG_SYS_MAX_FLASH_SECT=8 > +CONFIG_SYS_MAX_FLASH_SECT=12 > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_STMICRO=y > diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig > index b56d88f9f6..b5d54b48ec 100644 > --- a/configs/stm32f769-disco_spl_defconfig > +++ b/configs/stm32f769-disco_spl_defconfig > @@ -63,7 +63,7 @@ CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_MTD_NOR_FLASH=y > CONFIG_STM32_FLASH=y > -CONFIG_SYS_MAX_FLASH_SECT=8 > +CONFIG_SYS_MAX_FLASH_SECT=12 > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPI_FLASH_STMICRO=y Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Thanks Patrick
On 9/26/22 15:05, Patrick DELAUNAY wrote: > Hi, > > On 9/20/22 18:04, Patrice Chotard wrote: >> arch-stm32f7/stm32.h file is shared between STM32F746 and STM32F769 >> MCUs. But STM32F769 embeds 2MB of internal flash instead of 1MB for >> STM32F746. The flash layout is quite similar between the 2 SoCs : >> >> STM32F746 STM32F769 >> 4 * 32KB sectors 4 * 32KB sectors >> 1 * 128KB sector 1 * 128KB sector >> 3 * 256KB sectors 7 * 256KB sectors >> >> Update sect_sz_kb[] structure and SYS_MAX_FLASH_SECT accordingly. >> >> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> >> >> --- >> >> Changes in v2: >> - Remove SYS_UBOOT_FLAG from stm32f746-disco.h >> >> arch/arm/include/asm/arch-stm32f7/stm32.h | 6 +++--- >> configs/stm32f769-disco_defconfig | 2 +- >> configs/stm32f769-disco_spl_defconfig | 2 +- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h >> index 3451e74a3d..57db839e8d 100644 >> --- a/arch/arm/include/asm/arch-stm32f7/stm32.h >> +++ b/arch/arm/include/asm/arch-stm32f7/stm32.h >> @@ -10,9 +10,9 @@ >> #include <asm/arch-stm32/stm32f.h> >> static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = { >> - [0 ... 3] = 32 * 1024, >> - [4] = 128 * 1024, >> - [5 ... 7] = 256 * 1024 >> + [0 ... 3] = 32 * 1024, >> + [4] = 128 * 1024, >> + [5 ... CONFIG_SYS_MAX_FLASH_SECT - 1] = 256 * 1024 >> }; >> #endif /* _ASM_ARCH_HARDWARE_H */ >> diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig >> index 423af7446a..5b5307ca1d 100644 >> --- a/configs/stm32f769-disco_defconfig >> +++ b/configs/stm32f769-disco_defconfig >> @@ -41,7 +41,7 @@ CONFIG_MTD=y >> CONFIG_DM_MTD=y >> CONFIG_MTD_NOR_FLASH=y >> CONFIG_STM32_FLASH=y >> -CONFIG_SYS_MAX_FLASH_SECT=8 >> +CONFIG_SYS_MAX_FLASH_SECT=12 >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH_MACRONIX=y >> CONFIG_SPI_FLASH_STMICRO=y >> diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig >> index b56d88f9f6..b5d54b48ec 100644 >> --- a/configs/stm32f769-disco_spl_defconfig >> +++ b/configs/stm32f769-disco_spl_defconfig >> @@ -63,7 +63,7 @@ CONFIG_MTD=y >> CONFIG_DM_MTD=y >> CONFIG_MTD_NOR_FLASH=y >> CONFIG_STM32_FLASH=y >> -CONFIG_SYS_MAX_FLASH_SECT=8 >> +CONFIG_SYS_MAX_FLASH_SECT=12 >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH_MACRONIX=y >> CONFIG_SPI_FLASH_STMICRO=y > > > > Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > > Thanks > Patrick > Applied to u-boot-stm32/next Thanks
diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h index 3451e74a3d..57db839e8d 100644 --- a/arch/arm/include/asm/arch-stm32f7/stm32.h +++ b/arch/arm/include/asm/arch-stm32f7/stm32.h @@ -10,9 +10,9 @@ #include <asm/arch-stm32/stm32f.h> static const u32 sect_sz_kb[CONFIG_SYS_MAX_FLASH_SECT] = { - [0 ... 3] = 32 * 1024, - [4] = 128 * 1024, - [5 ... 7] = 256 * 1024 + [0 ... 3] = 32 * 1024, + [4] = 128 * 1024, + [5 ... CONFIG_SYS_MAX_FLASH_SECT - 1] = 256 * 1024 }; #endif /* _ASM_ARCH_HARDWARE_H */ diff --git a/configs/stm32f769-disco_defconfig b/configs/stm32f769-disco_defconfig index 423af7446a..5b5307ca1d 100644 --- a/configs/stm32f769-disco_defconfig +++ b/configs/stm32f769-disco_defconfig @@ -41,7 +41,7 @@ CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_STM32_FLASH=y -CONFIG_SYS_MAX_FLASH_SECT=8 +CONFIG_SYS_MAX_FLASH_SECT=12 CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig index b56d88f9f6..b5d54b48ec 100644 --- a/configs/stm32f769-disco_spl_defconfig +++ b/configs/stm32f769-disco_spl_defconfig @@ -63,7 +63,7 @@ CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_STM32_FLASH=y -CONFIG_SYS_MAX_FLASH_SECT=8 +CONFIG_SYS_MAX_FLASH_SECT=12 CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y
arch-stm32f7/stm32.h file is shared between STM32F746 and STM32F769 MCUs. But STM32F769 embeds 2MB of internal flash instead of 1MB for STM32F746. The flash layout is quite similar between the 2 SoCs : STM32F746 STM32F769 4 * 32KB sectors 4 * 32KB sectors 1 * 128KB sector 1 * 128KB sector 3 * 256KB sectors 7 * 256KB sectors Update sect_sz_kb[] structure and SYS_MAX_FLASH_SECT accordingly. Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> --- Changes in v2: - Remove SYS_UBOOT_FLAG from stm32f746-disco.h arch/arm/include/asm/arch-stm32f7/stm32.h | 6 +++--- configs/stm32f769-disco_defconfig | 2 +- configs/stm32f769-disco_spl_defconfig | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)