[PATCH v2 0/7] SPL fixes for STM32F7 MCUs

[PATCH v2 0/7] SPL fixes for STM32F7 MCUs

[Patrice Chotard]

This series is fixing issues in SPL boot mode:
   - SPL binary size over 0x8000 bytes for STM32F746-disco, STM32F769-DISCO and STM32746G-EVAL boards
   - fix embedded flash size for STM32F769-DISCO
   - fix CONFIG_SYS_SPL_ARGS_ADDR for STM32F746-DISCO and STM32746G-EVAL

Changes in v2:
  - Remove SYS_UBOOT_FLAG from stm32f746-disco.h

Patrice Chotard (7):
  configs: stm32f746-disco: Fix SPL boot
  configs: stm32f769-disco: Fix SPL boot
  configs: stm32746g-eval: Fix SPL boot
  configs: stm32f746-disco: Fix CONFIG_SYS_SPL_ARGS_ADDR
  configs: stm32746g-eval: Fix CONFIG_SYS_SPL_ARGS_ADDR
  config: stm32f769-disco: Fix internal flash size
  configs: stm32f746-disco: Remove CONFIG_SYS_UBOOT_START flag

 arch/arm/include/asm/arch-stm32f7/stm32.h | 6 +++---
 configs/stm32746g-eval_spl_defconfig      | 9 +++++----
 configs/stm32f746-disco_spl_defconfig     | 9 +++++----
 configs/stm32f769-disco_defconfig         | 2 +-
 configs/stm32f769-disco_spl_defconfig     | 9 +++++----
 include/configs/stm32f746-disco.h         | 1 -
 6 files changed, 19 insertions(+), 17 deletions(-)

-- 
2.25.1

[PATCH v2 1/7] configs: stm32f746-disco: Fix SPL boot

[Patrice Chotard]

Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
increases SPL size over the initial 0x8000 limit.
Increase the SPL size to 0x9000 to fix SPL boot.
Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.

Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 configs/stm32f746-disco_spl_defconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
index e7b1acc433..5e8a8aaf3c 100644
--- a/configs/stm32f746-disco_spl_defconfig
+++ b/configs/stm32f746-disco_spl_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_STM32=y
-CONFIG_SYS_TEXT_BASE=0x08008000
+CONFIG_SYS_TEXT_BASE=0x08009000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_SYS_MALLOC_F_LEN=0xE00
 CONFIG_SPL_GPIO=y
@@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
+CONFIG_SPL_SIZE_LIMIT=0x9000
 CONFIG_STM32F7=y
 CONFIG_TARGET_STM32F746_DISCO=y
 CONFIG_SPL=y
-CONFIG_SYS_LOAD_ADDR=0x8008000
+CONFIG_SYS_LOAD_ADDR=0x8009000
 CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
@@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_LATE_INIT=y
-CONFIG_SPL_PAD_TO=0x8000
+CONFIG_SPL_PAD_TO=0x9000
 CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-- 
2.25.1

[PATCH v2 2/7] configs: stm32f769-disco: Fix SPL boot

[Patrice Chotard]

Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
increases SPL size over the initial 0x8000 limit.
Increase the SPL size to 0x9000 to fix SPL boot.
Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.

Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 configs/stm32f769-disco_spl_defconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig
index 19d2c24abb..b56d88f9f6 100644
--- a/configs/stm32f769-disco_spl_defconfig
+++ b/configs/stm32f769-disco_spl_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_STM32=y
-CONFIG_SYS_TEXT_BASE=0x08008000
+CONFIG_SYS_TEXT_BASE=0x08009000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_SYS_MALLOC_F_LEN=0xE00
 CONFIG_SPL_GPIO=y
@@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
+CONFIG_SPL_SIZE_LIMIT=0x9000
 CONFIG_STM32F7=y
 CONFIG_TARGET_STM32F746_DISCO=y
 CONFIG_SPL=y
-CONFIG_SYS_LOAD_ADDR=0x8008000
+CONFIG_SYS_LOAD_ADDR=0x8009000
 CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
@@ -28,7 +29,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 # CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SPL_PAD_TO=0x8000
+CONFIG_SPL_PAD_TO=0x9000
 CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-- 
2.25.1

[PATCH v2 3/7] configs: stm32746g-eval: Fix SPL boot

[Patrice Chotard]

Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
increases SPL size over the initial 0x8000 limit.
Increase the SPL size to 0x9000 to fix SPL boot.
Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.

Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 configs/stm32746g-eval_spl_defconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
index a3b7146454..d8d55c2d3c 100644
--- a/configs/stm32746g-eval_spl_defconfig
+++ b/configs/stm32746g-eval_spl_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_STM32=y
-CONFIG_SYS_TEXT_BASE=0x08008000
+CONFIG_SYS_TEXT_BASE=0x08009000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_SYS_MALLOC_F_LEN=0xE00
 CONFIG_SPL_GPIO=y
@@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
+CONFIG_SPL_SIZE_LIMIT=0x9000
 CONFIG_STM32F7=y
 CONFIG_TARGET_STM32F746_DISCO=y
 CONFIG_SPL=y
-CONFIG_SYS_LOAD_ADDR=0x8008000
+CONFIG_SYS_LOAD_ADDR=0x8009000
 CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
@@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_LATE_INIT=y
-CONFIG_SPL_PAD_TO=0x8000
+CONFIG_SPL_PAD_TO=0x9000
 CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-- 
2.25.1

[PATCH v2 4/7] configs: stm32f746-disco: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrice Chotard]

STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
It solves hard fault when jumping from SPL to U-Boot.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 configs/stm32f746-disco_spl_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
index 5e8a8aaf3c..d4a65bde24 100644
--- a/configs/stm32f746-disco_spl_defconfig
+++ b/configs/stm32f746-disco_spl_defconfig
@@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_XIP_SUPPORT=y
-CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
+CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
 CONFIG_SPL_DM_RESET=y
 CONFIG_SYS_PBSIZE=1050
 CONFIG_CMD_GPT=y
-- 
2.25.1

[PATCH v2 5/7] configs: stm32746g-eval: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrice Chotard]

STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
It solves hard fault when jumping from SPL to U-Boot.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 configs/stm32746g-eval_spl_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
index d8d55c2d3c..28f522b15e 100644
--- a/configs/stm32746g-eval_spl_defconfig
+++ b/configs/stm32746g-eval_spl_defconfig
@@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_XIP_SUPPORT=y
-CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
+CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
 CONFIG_SPL_DM_RESET=y
 CONFIG_SYS_PBSIZE=1050
 CONFIG_CMD_GPT=y
-- 
2.25.1

[PATCH v2 6/7] config: stm32f769-disco: Fix internal flash size

[Patrice Chotard]

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
-- 
2.25.1

[PATCH v2 7/7] configs: stm32f746-disco: Remove CONFIG_SYS_UBOOT_START flag

[Patrice Chotard]

By pressing "c" key during SPL execution, we force U-boot execution
instead of a kernel XIP image.

This fixes a hard fault when booting stm32f746-disco in SPL with "c"
key pressed during SPL execution.

U-Boot SPL 2022.10-rc5-00009-g40d02baa91 (Sep 20 2022 - 17:21:21 +0200)
Trying to boot from XIP
Hard fault
pc : 080083fc    lr : 08000d1b    xPSR : 21000000
r12 : 2004f108   r3 : 080083fd    r2 : 00000028
r1 : 2004f0c8    r0 : 2004f0e4
Resetting CPU ...

This is due to SYS_UBOOT_START flag set to 0x080083FD which is not correct.
If unset, SYS_UBOOT_START is set by default to CONFIG_SYS_TEXT_BASE
which match with our requirement.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
---

(no changes since v1)

 include/configs/stm32f746-disco.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 64c1bc7d43..b0ec226114 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -34,7 +34,6 @@
 			BOOTENV
 
 #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
-#define CONFIG_SYS_UBOOT_START		0x080083FD
 #define CONFIG_SYS_UBOOT_BASE		(CONFIG_SYS_FLASH_BASE + \
 					 CONFIG_SPL_PAD_TO)
 
-- 
2.25.1

Re: [PATCH v2 0/7] SPL fixes for STM32F7 MCUs

[Waldemar Brodkorb]

Hi Patrice,
Patrice Chotard wrote,

> 
> This series is fixing issues in SPL boot mode:
>    - SPL binary size over 0x8000 bytes for STM32F746-disco, STM32F769-DISCO and STM32746G-EVAL boards
>    - fix embedded flash size for STM32F769-DISCO
>    - fix CONFIG_SYS_SPL_ARGS_ADDR for STM32F746-DISCO and STM32746G-EVAL
> 
> Changes in v2:
>   - Remove SYS_UBOOT_FLAG from stm32f746-disco.h

I tested this series and all is working fine now. Both defconfigs
and with or without Falcon mode. Thanks.

Tested-by: Waldemar Brodkorb <wbx@openadk.org>

best regards
 Waldemar

Re: [PATCH v2 1/7] configs: stm32f746-disco: Fix SPL boot

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
> increases SPL size over the initial 0x8000 limit.
> Increase the SPL size to 0x9000 to fix SPL boot.
> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>
> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   configs/stm32f746-disco_spl_defconfig | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
> index e7b1acc433..5e8a8aaf3c 100644
> --- a/configs/stm32f746-disco_spl_defconfig
> +++ b/configs/stm32f746-disco_spl_defconfig
> @@ -1,6 +1,6 @@
>   CONFIG_ARM=y
>   CONFIG_ARCH_STM32=y
> -CONFIG_SYS_TEXT_BASE=0x08008000
> +CONFIG_SYS_TEXT_BASE=0x08009000
>   CONFIG_SYS_MALLOC_LEN=0x100000
>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>   CONFIG_SPL_GPIO=y
> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>   CONFIG_SYS_PROMPT="U-Boot > "
>   CONFIG_SPL_SERIAL=y
>   CONFIG_SPL_DRIVERS_MISC=y
> +CONFIG_SPL_SIZE_LIMIT=0x9000
>   CONFIG_STM32F7=y
>   CONFIG_TARGET_STM32F746_DISCO=y
>   CONFIG_SPL=y
> -CONFIG_SYS_LOAD_ADDR=0x8008000
> +CONFIG_SYS_LOAD_ADDR=0x8009000
>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>   CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> @@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   CONFIG_BOARD_LATE_INIT=y
> -CONFIG_SPL_PAD_TO=0x8000
> +CONFIG_SPL_PAD_TO=0x9000
>   CONFIG_SPL_NO_BSS_LIMIT=y
>   CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y



Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 2/7] configs: stm32f769-disco: Fix SPL boot

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
> increases SPL size over the initial 0x8000 limit.
> Increase the SPL size to 0x9000 to fix SPL boot.
> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>
> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   configs/stm32f769-disco_spl_defconfig | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig
> index 19d2c24abb..b56d88f9f6 100644
> --- a/configs/stm32f769-disco_spl_defconfig
> +++ b/configs/stm32f769-disco_spl_defconfig
> @@ -1,6 +1,6 @@
>   CONFIG_ARM=y
>   CONFIG_ARCH_STM32=y
> -CONFIG_SYS_TEXT_BASE=0x08008000
> +CONFIG_SYS_TEXT_BASE=0x08009000
>   CONFIG_SYS_MALLOC_LEN=0x100000
>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>   CONFIG_SPL_GPIO=y
> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>   CONFIG_SYS_PROMPT="U-Boot > "
>   CONFIG_SPL_SERIAL=y
>   CONFIG_SPL_DRIVERS_MISC=y
> +CONFIG_SPL_SIZE_LIMIT=0x9000
>   CONFIG_STM32F7=y
>   CONFIG_TARGET_STM32F746_DISCO=y
>   CONFIG_SPL=y
> -CONFIG_SYS_LOAD_ADDR=0x8008000
> +CONFIG_SYS_LOAD_ADDR=0x8009000
>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>   CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> @@ -28,7 +29,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>   # CONFIG_DISPLAY_CPUINFO is not set
> -CONFIG_SPL_PAD_TO=0x8000
> +CONFIG_SPL_PAD_TO=0x9000
>   CONFIG_SPL_NO_BSS_LIMIT=y
>   CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 3/7] configs: stm32746g-eval: Fix SPL boot

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
> increases SPL size over the initial 0x8000 limit.
> Increase the SPL size to 0x9000 to fix SPL boot.
> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>
> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   configs/stm32746g-eval_spl_defconfig | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
> index a3b7146454..d8d55c2d3c 100644
> --- a/configs/stm32746g-eval_spl_defconfig
> +++ b/configs/stm32746g-eval_spl_defconfig
> @@ -1,6 +1,6 @@
>   CONFIG_ARM=y
>   CONFIG_ARCH_STM32=y
> -CONFIG_SYS_TEXT_BASE=0x08008000
> +CONFIG_SYS_TEXT_BASE=0x08009000
>   CONFIG_SYS_MALLOC_LEN=0x100000
>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>   CONFIG_SPL_GPIO=y
> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>   CONFIG_SYS_PROMPT="U-Boot > "
>   CONFIG_SPL_SERIAL=y
>   CONFIG_SPL_DRIVERS_MISC=y
> +CONFIG_SPL_SIZE_LIMIT=0x9000
>   CONFIG_STM32F7=y
>   CONFIG_TARGET_STM32F746_DISCO=y
>   CONFIG_SPL=y
> -CONFIG_SYS_LOAD_ADDR=0x8008000
> +CONFIG_SYS_LOAD_ADDR=0x8009000
>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>   CONFIG_DISTRO_DEFAULTS=y
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> @@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   CONFIG_BOARD_LATE_INIT=y
> -CONFIG_SPL_PAD_TO=0x8000
> +CONFIG_SPL_PAD_TO=0x9000
>   CONFIG_SPL_NO_BSS_LIMIT=y
>   CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 4/7] configs: stm32f746-disco: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
> fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
> It solves hard fault when jumping from SPL to U-Boot.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   configs/stm32f746-disco_spl_defconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
> index 5e8a8aaf3c..d4a65bde24 100644
> --- a/configs/stm32f746-disco_spl_defconfig
> +++ b/configs/stm32f746-disco_spl_defconfig
> @@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
>   CONFIG_SPL_MTD_SUPPORT=y
>   CONFIG_SPL_XIP_SUPPORT=y
> -CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
> +CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
>   CONFIG_SPL_DM_RESET=y
>   CONFIG_SYS_PBSIZE=1050
>   CONFIG_CMD_GPT=y


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 5/7] configs: stm32746g-eval: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
> fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
> It solves hard fault when jumping from SPL to U-Boot.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   configs/stm32746g-eval_spl_defconfig | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
> index d8d55c2d3c..28f522b15e 100644
> --- a/configs/stm32746g-eval_spl_defconfig
> +++ b/configs/stm32746g-eval_spl_defconfig
> @@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
>   CONFIG_SPL_MTD_SUPPORT=y
>   CONFIG_SPL_XIP_SUPPORT=y
> -CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
> +CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
>   CONFIG_SPL_DM_RESET=y
>   CONFIG_SYS_PBSIZE=1050
>   CONFIG_CMD_GPT=y


Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 7/7] configs: stm32f746-disco: Remove CONFIG_SYS_UBOOT_START flag

[Patrick DELAUNAY]

Hi,

On 9/20/22 18:04, Patrice Chotard wrote:
> By pressing "c" key during SPL execution, we force U-boot execution
> instead of a kernel XIP image.
>
> This fixes a hard fault when booting stm32f746-disco in SPL with "c"
> key pressed during SPL execution.
>
> U-Boot SPL 2022.10-rc5-00009-g40d02baa91 (Sep 20 2022 - 17:21:21 +0200)
> Trying to boot from XIP
> Hard fault
> pc : 080083fc    lr : 08000d1b    xPSR : 21000000
> r12 : 2004f108   r3 : 080083fd    r2 : 00000028
> r1 : 2004f0c8    r0 : 2004f0e4
> Resetting CPU ...
>
> This is due to SYS_UBOOT_START flag set to 0x080083FD which is not correct.
> If unset, SYS_UBOOT_START is set by default to CONFIG_SYS_TEXT_BASE
> which match with our requirement.
>
> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
> ---
>
> (no changes since v1)
>
>   include/configs/stm32f746-disco.h | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
> index 64c1bc7d43..b0ec226114 100644
> --- a/include/configs/stm32f746-disco.h
> +++ b/include/configs/stm32f746-disco.h
> @@ -34,7 +34,6 @@
>   			BOOTENV
>   
>   #define CONFIG_SYS_MONITOR_LEN		(512 * 1024)
> -#define CONFIG_SYS_UBOOT_START		0x080083FD
>   #define CONFIG_SYS_UBOOT_BASE		(CONFIG_SYS_FLASH_BASE + \
>   					 CONFIG_SPL_PAD_TO)
>   



Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

Thanks
Patrick

Re: [PATCH v2 6/7] config: stm32f769-disco: Fix internal flash size

[Patrick DELAUNAY]

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

Re: [PATCH v2 1/7] configs: stm32f746-disco: Fix SPL boot

[Patrice CHOTARD]

On 9/26/22 14:50, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
>> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
>> increases SPL size over the initial 0x8000 limit.
>> Increase the SPL size to 0x9000 to fix SPL boot.
>> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>>
>> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   configs/stm32f746-disco_spl_defconfig | 7 ++++---
>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
>> index e7b1acc433..5e8a8aaf3c 100644
>> --- a/configs/stm32f746-disco_spl_defconfig
>> +++ b/configs/stm32f746-disco_spl_defconfig
>> @@ -1,6 +1,6 @@
>>   CONFIG_ARM=y
>>   CONFIG_ARCH_STM32=y
>> -CONFIG_SYS_TEXT_BASE=0x08008000
>> +CONFIG_SYS_TEXT_BASE=0x08009000
>>   CONFIG_SYS_MALLOC_LEN=0x100000
>>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>>   CONFIG_SPL_GPIO=y
>> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>>   CONFIG_SYS_PROMPT="U-Boot > "
>>   CONFIG_SPL_SERIAL=y
>>   CONFIG_SPL_DRIVERS_MISC=y
>> +CONFIG_SPL_SIZE_LIMIT=0x9000
>>   CONFIG_STM32F7=y
>>   CONFIG_TARGET_STM32F746_DISCO=y
>>   CONFIG_SPL=y
>> -CONFIG_SYS_LOAD_ADDR=0x8008000
>> +CONFIG_SYS_LOAD_ADDR=0x8009000
>>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>>   CONFIG_DISTRO_DEFAULTS=y
>>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> @@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
>>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>>   # CONFIG_DISPLAY_CPUINFO is not set
>>   CONFIG_BOARD_LATE_INIT=y
>> -CONFIG_SPL_PAD_TO=0x8000
>> +CONFIG_SPL_PAD_TO=0x9000
>>   CONFIG_SPL_NO_BSS_LIMIT=y
>>   CONFIG_SPL_BOARD_INIT=y
>>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> 
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks

Re: [PATCH v2 2/7] configs: stm32f769-disco: Fix SPL boot

[Patrice CHOTARD]

On 9/26/22 14:57, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
>> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
>> increases SPL size over the initial 0x8000 limit.
>> Increase the SPL size to 0x9000 to fix SPL boot.
>> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>>
>> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   configs/stm32f769-disco_spl_defconfig | 7 ++++---
>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig
>> index 19d2c24abb..b56d88f9f6 100644
>> --- a/configs/stm32f769-disco_spl_defconfig
>> +++ b/configs/stm32f769-disco_spl_defconfig
>> @@ -1,6 +1,6 @@
>>   CONFIG_ARM=y
>>   CONFIG_ARCH_STM32=y
>> -CONFIG_SYS_TEXT_BASE=0x08008000
>> +CONFIG_SYS_TEXT_BASE=0x08009000
>>   CONFIG_SYS_MALLOC_LEN=0x100000
>>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>>   CONFIG_SPL_GPIO=y
>> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>>   CONFIG_SYS_PROMPT="U-Boot > "
>>   CONFIG_SPL_SERIAL=y
>>   CONFIG_SPL_DRIVERS_MISC=y
>> +CONFIG_SPL_SIZE_LIMIT=0x9000
>>   CONFIG_STM32F7=y
>>   CONFIG_TARGET_STM32F746_DISCO=y
>>   CONFIG_SPL=y
>> -CONFIG_SYS_LOAD_ADDR=0x8008000
>> +CONFIG_SYS_LOAD_ADDR=0x8009000
>>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>>   CONFIG_DISTRO_DEFAULTS=y
>>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> @@ -28,7 +29,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>>   CONFIG_USE_BOOTARGS=y
>>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>>   # CONFIG_DISPLAY_CPUINFO is not set
>> -CONFIG_SPL_PAD_TO=0x8000
>> +CONFIG_SPL_PAD_TO=0x9000
>>   CONFIG_SPL_NO_BSS_LIMIT=y
>>   CONFIG_SPL_BOARD_INIT=y
>>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks

Re: [PATCH v2 3/7] configs: stm32746g-eval: Fix SPL boot

[Patrice CHOTARD]

On 9/26/22 14:57, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> Commit 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>> replaces CONFIG_SYS_FDT_BASE by CONFIG_SYS_SPL_ARGS_ADDR.
>> As CONFIG_SYS_SPL_ARGS_ADDR enables additional code when enable, it
>> increases SPL size over the initial 0x8000 limit.
>> Increase the SPL size to 0x9000 to fix SPL boot.
>> Set SPL_SIZE_LIMIT to 0x9000 to avoid similar issue in the future.
>>
>> Fixes 'b4b9a00ed593 ("Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig")'
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   configs/stm32746g-eval_spl_defconfig | 7 ++++---
>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
>> index a3b7146454..d8d55c2d3c 100644
>> --- a/configs/stm32746g-eval_spl_defconfig
>> +++ b/configs/stm32746g-eval_spl_defconfig
>> @@ -1,6 +1,6 @@
>>   CONFIG_ARM=y
>>   CONFIG_ARCH_STM32=y
>> -CONFIG_SYS_TEXT_BASE=0x08008000
>> +CONFIG_SYS_TEXT_BASE=0x08009000
>>   CONFIG_SYS_MALLOC_LEN=0x100000
>>   CONFIG_SYS_MALLOC_F_LEN=0xE00
>>   CONFIG_SPL_GPIO=y
>> @@ -13,10 +13,11 @@ CONFIG_SPL_TEXT_BASE=0x8000000
>>   CONFIG_SYS_PROMPT="U-Boot > "
>>   CONFIG_SPL_SERIAL=y
>>   CONFIG_SPL_DRIVERS_MISC=y
>> +CONFIG_SPL_SIZE_LIMIT=0x9000
>>   CONFIG_STM32F7=y
>>   CONFIG_TARGET_STM32F746_DISCO=y
>>   CONFIG_SPL=y
>> -CONFIG_SYS_LOAD_ADDR=0x8008000
>> +CONFIG_SYS_LOAD_ADDR=0x8009000
>>   CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
>>   CONFIG_DISTRO_DEFAULTS=y
>>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> @@ -29,7 +30,7 @@ CONFIG_USE_BOOTARGS=y
>>   CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
>>   # CONFIG_DISPLAY_CPUINFO is not set
>>   CONFIG_BOARD_LATE_INIT=y
>> -CONFIG_SPL_PAD_TO=0x8000
>> +CONFIG_SPL_PAD_TO=0x9000
>>   CONFIG_SPL_NO_BSS_LIMIT=y
>>   CONFIG_SPL_BOARD_INIT=y
>>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks

Re: [PATCH v2 4/7] configs: stm32f746-disco: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrice CHOTARD]

On 9/26/22 14:58, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
>> fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
>> It solves hard fault when jumping from SPL to U-Boot.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   configs/stm32f746-disco_spl_defconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
>> index 5e8a8aaf3c..d4a65bde24 100644
>> --- a/configs/stm32f746-disco_spl_defconfig
>> +++ b/configs/stm32f746-disco_spl_defconfig
>> @@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
>>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
>>   CONFIG_SPL_MTD_SUPPORT=y
>>   CONFIG_SPL_XIP_SUPPORT=y
>> -CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
>> +CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
>>   CONFIG_SPL_DM_RESET=y
>>   CONFIG_SYS_PBSIZE=1050
>>   CONFIG_CMD_GPT=y
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks

Re: [PATCH v2 5/7] configs: stm32746g-eval: Fix CONFIG_SYS_SPL_ARGS_ADDR

[Patrice CHOTARD]

On 9/26/22 14:58, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> STM32F746 embeds 1 MB of internal flash [0x08000000-0x080fffff],
>> fix CONFIG_SYS_SPL_ARGS_ADDR accordingly
>> It solves hard fault when jumping from SPL to U-Boot.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   configs/stm32746g-eval_spl_defconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
>> index d8d55c2d3c..28f522b15e 100644
>> --- a/configs/stm32746g-eval_spl_defconfig
>> +++ b/configs/stm32746g-eval_spl_defconfig
>> @@ -36,7 +36,7 @@ CONFIG_SPL_BOARD_INIT=y
>>   CONFIG_SPL_SYS_MALLOC_SIMPLE=y
>>   CONFIG_SPL_MTD_SUPPORT=y
>>   CONFIG_SPL_XIP_SUPPORT=y
>> -CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
>> +CONFIG_SYS_SPL_ARGS_ADDR=0x80c0000
>>   CONFIG_SPL_DM_RESET=y
>>   CONFIG_SYS_PBSIZE=1050
>>   CONFIG_CMD_GPT=y
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks

Re: [PATCH v2 6/7] config: stm32f769-disco: Fix internal flash size

[Patrice CHOTARD]

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

Re: [PATCH v2 7/7] configs: stm32f746-disco: Remove CONFIG_SYS_UBOOT_START flag

[Patrice CHOTARD]

On 9/26/22 15:02, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/20/22 18:04, Patrice Chotard wrote:
>> By pressing "c" key during SPL execution, we force U-boot execution
>> instead of a kernel XIP image.
>>
>> This fixes a hard fault when booting stm32f746-disco in SPL with "c"
>> key pressed during SPL execution.
>>
>> U-Boot SPL 2022.10-rc5-00009-g40d02baa91 (Sep 20 2022 - 17:21:21 +0200)
>> Trying to boot from XIP
>> Hard fault
>> pc : 080083fc    lr : 08000d1b    xPSR : 21000000
>> r12 : 2004f108   r3 : 080083fd    r2 : 00000028
>> r1 : 2004f0c8    r0 : 2004f0e4
>> Resetting CPU ...
>>
>> This is due to SYS_UBOOT_START flag set to 0x080083FD which is not correct.
>> If unset, SYS_UBOOT_START is set by default to CONFIG_SYS_TEXT_BASE
>> which match with our requirement.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
>> ---
>>
>> (no changes since v1)
>>
>>   include/configs/stm32f746-disco.h | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
>> index 64c1bc7d43..b0ec226114 100644
>> --- a/include/configs/stm32f746-disco.h
>> +++ b/include/configs/stm32f746-disco.h
>> @@ -34,7 +34,6 @@
>>               BOOTENV
>>     #define CONFIG_SYS_MONITOR_LEN        (512 * 1024)
>> -#define CONFIG_SYS_UBOOT_START        0x080083FD
>>   #define CONFIG_SYS_UBOOT_BASE        (CONFIG_SYS_FLASH_BASE + \
>>                        CONFIG_SPL_PAD_TO)
>>   
> 
> 
> 
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> 
> Thanks
> Patrick
> 
Applied to u-boot-stm32/next

Thanks