Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mcuboot supports the stm32 external flash in XiP mode #2154

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

mcuboot supports the stm32 external flash in XiP mode #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de75369
boot: zephyr: defines FLASH device for external NOR
FRASTM Sep 1, 2023
6553b93
boot: zephyr: boards config of the stm32 disco kit
FRASTM Oct 19, 2023
a24f42d
boot: zephyr: boards config of the stm32h7s78 disco kit
FRASTM Feb 29, 2024
0e335dd
boot: zephyr: xspi1 for RWW on external NOR of stm32h7s78 disco kit
FRASTM Apr 15, 2024
500f4bd
boot: zephyr: boards config of the stm32h7s3l8 nucleo
FRASTM Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions boot/zephyr/boards/b_u585i_iot02a.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
3 changes: 3 additions & 0 deletions boot/zephyr/boards/nucleo_h7s3l8.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
CONFIG_BOOT_MAX_IMG_SECTORS_AUTO=n
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32f746g_disco.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32h735g_disco.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32h747i_disco_m7.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32h750b_dk.conf
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FRASTM I had to add CONFIG_BOOT_MAX_IMG_SECTORS_AUTO=n CONFIG_BOOT_MAX_IMG_SECTORS=256 as well to get it working.
With the following memory layout in board dts:

/* 128KB sector size */
&flash0 {
	partitions {
		boot_partition: partition@0 {
			label = "mcuboot";
			reg = <0x00000000 DT_SIZE_K(128)>;
		};
	};
};

/* Sector erase 64KB uniform granularity */
/* Subsector erase 4KB, 32KB granularity */
&mt25ql512ab1 {
        status = "okay";
	partitions {
                slot0_partition: partition@0 {
			label = "image-0";
			reg = <0x00000000 DT_SIZE_K(2048)>;
		};
		slot1_partition: partition@200000 {
			label = "image-1";
			reg = <0x00200000 DT_SIZE_K(2048)>;
		};
		storage_partition: partition@400000 {
			label = "storage";
			reg = <0x00400000 DT_SIZE_K(128)>;
		};
        };
};

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32h7b3i_dk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32h7s78_dk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
49 changes: 49 additions & 0 deletions boot/zephyr/boards/stm32h7s78_dk.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Copyright (c) 2024 STMicroelectronics
*
* SPDX-License-Identifier: Apache-2.0
*/

&xspi1 {
/* same pining as xspi2 */
pinctrl-0 = <&xspim_p2_clk_pn6 &xspim_p2_ncs1_pn1
&xspim_p2_io0_pn2 &xspim_p2_io1_pn3
&xspim_p2_io2_pn4 &xspim_p2_io3_pn5
&xspim_p2_io4_pn8 &xspim_p2_io5_pn9
&xspim_p2_io6_pn10 &xspim_p2_io7_pn11
&xspim_p2_dqs0_pn0>;
pinctrl-names = "default";

status = "okay";

mx66uw1g45: xspi-nor-flash@72000000 {
compatible = "st,stm32-xspi-nor";
reg = <0x72000000 DT_SIZE_M(96)>; /* bank1 - 3*/
ospi-max-frequency = <DT_FREQ_M(50)>;
spi-bus-width = <XSPI_OCTO_MODE>;
data-rate = <XSPI_DTR_TRANSFER>;
status = "okay";

partitions {
compatible = "fixed-partitions";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be in the upstream zephyr board so it's visible to everything

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The xspi1 node is not enabled in the zephyr boards/st/stm32h7s78_dk/
then moving the overlay from mcuboot to zephyr board DTS will create a dependency with another next PR in zephyr (a PR to add the xspi1 node)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FRASTM I think this can be dropped from this PR since Zephyr STM32 XSPI driver doesn't support H7RS series yet (if I'm not mistaken).

#address-cells = <1>;
#size-cells = <1>;
/* bank1 */
slot1_partition: partition@0000000 {
label = "image-1";
reg = <0x0000000 DT_SIZE_K(416)>;
};
/* bank2 */
scratch_partition: partition@2000000 {
label = "image-scratch";
reg = <0x2000000 DT_SIZE_M(32)>;
};
/* bank3 */
storage_partition: partition@4000000 {
label = "storage";
reg = <0x4000000 DT_SIZE_M(32)>;
};
};
};
};

2 changes: 2 additions & 0 deletions boot/zephyr/boards/stm32l496g_disco.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_BOOT_DIRECT_XIP=y
CONFIG_STM32_MEMMAP=y
18 changes: 17 additions & 1 deletion boot/zephyr/flash_map_extended.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,23 @@

BOOT_LOG_MODULE_DECLARE(mcuboot);

#if (!defined(CONFIG_XTENSA) && DT_HAS_CHOSEN(zephyr_flash_controller))
#if defined(CONFIG_STM32_MEMMAP)
/* MEMORY MAPPED for XiP on external NOR flash takes the sspi-nor or ospi-nor or qspi-nor device */
#define FLASH_DEVICE_ID SPI_FLASH_0_ID
#if DT_NODE_HAS_STATUS(DT_INST(0, st_stm32_xspi_nor), okay)
#define FLASH_DEVICE_NODE DT_INST(0, st_stm32_xspi_nor)
#define FLASH_DEVICE_BASE DT_REG_ADDR(DT_INST(0, st_stm32_xspi_nor))
#elif DT_NODE_HAS_STATUS(DT_INST(0, st_stm32_ospi_nor), okay)
#define FLASH_DEVICE_NODE DT_INST(0, st_stm32_ospi_nor)
#define FLASH_DEVICE_BASE DT_REG_ADDR(DT_INST(0, st_stm32_ospi_nor))
#elif DT_NODE_HAS_STATUS(DT_INST(0, st_stm32_qspi_nor), okay)
#define FLASH_DEVICE_NODE DT_INST(0, st_stm32_qspi_nor)
#define FLASH_DEVICE_BASE DT_REG_ADDR(DT_INST(0, st_stm32_qspi_nor))
#else
#error "FLASH_DEVICE_NODE could not be determined"
#endif

#elif (!defined(CONFIG_XTENSA) && DT_HAS_CHOSEN(zephyr_flash_controller))
#define FLASH_DEVICE_ID SOC_FLASH_0_ID
#define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
#define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash_controller)
Expand Down