diff --git a/boards/st/stm32h750b_dk/Kconfig.defconfig b/boards/st/stm32h750b_dk/Kconfig.defconfig index bcc1ec705eb65..658813e6b6f40 100644 --- a/boards/st/stm32h750b_dk/Kconfig.defconfig +++ b/boards/st/stm32h750b_dk/Kconfig.defconfig @@ -14,4 +14,11 @@ config MEMC endif # DISPLAY +if MCUBOOT + +config STM32_MEMMAP + default y + +endif # MCUBOOT + endif # BOARD_STM32H750B_DK diff --git a/boards/st/stm32h750b_dk/Kconfig.sysbuild b/boards/st/stm32h750b_dk/Kconfig.sysbuild new file mode 100644 index 0000000000000..79c4169eb5b0c --- /dev/null +++ b/boards/st/stm32h750b_dk/Kconfig.sysbuild @@ -0,0 +1,14 @@ +# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors +# SPDX-License-Identifier: Apache-2.0 + +choice BOOTLOADER + default BOOTLOADER_MCUBOOT +endchoice + +choice BOOT_SIGNATURE_TYPE + default BOOT_SIGNATURE_TYPE_NONE +endchoice + +choice MCUBOOT_MODE + default MCUBOOT_MODE_DIRECT_XIP +endchoice diff --git a/boards/st/stm32h750b_dk/board.cmake b/boards/st/stm32h750b_dk/board.cmake index 7ca52afb25fa9..23f64aa667f73 100644 --- a/boards/st/stm32h750b_dk/board.cmake +++ b/boards/st/stm32h750b_dk/board.cmake @@ -1,7 +1,8 @@ +# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors # SPDX-License-Identifier: Apache-2.0 # keep first -if(CONFIG_STM32_MEMMAP) +if(CONFIG_STM32_MEMMAP OR CONFIG_BOOTLOADER_MCUBOOT) board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw") board_runner_args(stm32cubeprogrammer "--extload=MT25TL01G_STM32H750B-DISCO.stldr") else() diff --git a/boards/st/stm32h750b_dk/board.yml b/boards/st/stm32h750b_dk/board.yml index 9c95b1c77d146..3a0c6bfd9b22d 100644 --- a/boards/st/stm32h750b_dk/board.yml +++ b/boards/st/stm32h750b_dk/board.yml @@ -4,3 +4,5 @@ board: vendor: st socs: - name: stm32h750xx + variants: + - name: ext_flash_app diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk-common.dtsi b/boards/st/stm32h750b_dk/stm32h750b_dk-common.dtsi new file mode 100644 index 0000000000000..ea7f535bb635b --- /dev/null +++ b/boards/st/stm32h750b_dk/stm32h750b_dk-common.dtsi @@ -0,0 +1,255 @@ +/* + * Copyright (c) 2023-2024 STMicroelectronics + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include +#include "arduino_r3_connector.dtsi" +#include + +/ { + chosen { + zephyr,console = &usart3; + zephyr,shell-uart = &usart3; + zephyr,sram = &sram0; + zephyr,display = <dc; + }; + + sdram2: sdram@d0000000 { + compatible = "zephyr,memory-region", "mmio-sram"; + device_type = "memory"; + reg = <0xd0000000 DT_SIZE_M(16)>; /* 128Mbit */ + zephyr,memory-region = "SDRAM2"; + zephyr,memory-attr = ; + }; + + ext_flash: memory@90000000 { + compatible = "zephyr,memory-region"; + reg = <0x90000000 DT_SIZE_M(128)>; /* 128MB */ + zephyr,memory-region = "EXT_FLASH"; + zephyr,memory-attr = ; + }; + + leds { + compatible = "gpio-leds"; + + red_led: led_1 { + gpios = <&gpioi 13 GPIO_ACTIVE_LOW>; + label = "USER1 LD6"; + }; + + green_led: led_2 { + gpios = <&gpioj 2 GPIO_ACTIVE_LOW>; + label = "USER2 LD7"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + + user_button: button { + label = "User"; + gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>; + zephyr,code = ; + }; + }; + + aliases { + led0 = &green_led; + led1 = &red_led; + sw0 = &user_button; + die-temp0 = &die_temp; + }; +}; + +&clk_hse { + clock-frequency = ; + hse-bypass; + status = "okay"; +}; + +&clk_lse { + status = "okay"; +}; + +&flash0 { + status = "okay"; +}; + +<dc { + pinctrl-0 = <<dc_r0_pi15 <dc_r1_pj0 <dc_r2_pj1 <dc_r3_ph9 + <dc_r4_pj3 <dc_r5_pj4 <dc_r6_pj5 <dc_r7_pj6 + <dc_g0_pj7 <dc_g1_pj8 <dc_g2_pj9 <dc_g3_pj10 + <dc_g4_pj11 <dc_g5_pi0 <dc_g6_pi1 <dc_g7_pk2 + <dc_b0_pj12 <dc_b1_pj13 <dc_b2_pj14 <dc_b3_pj15 + <dc_b4_pk3 <dc_b5_pk4 <dc_b6_pk5 <dc_b7_pk6 + <dc_de_pk7 <dc_clk_pi14 <dc_hsync_pi12 <dc_vsync_pi9>; + pinctrl-names = "default"; + + disp-on-gpios = <&gpiod 7 GPIO_ACTIVE_HIGH>; + + ext-sdram = <&sdram2>; + status = "okay"; + + clocks = <&rcc STM32_CLOCK(APB3, 3)>, + <&rcc STM32_SRC_PLL3_R NO_SEL>; + + width = <480>; + height = <272>; + pixel-format = ; + + display-timings { + compatible = "zephyr,panel-timing"; + de-active = <1>; + pixelclk-active = <0>; + hsync-active = <0>; + vsync-active = <0>; + hsync-len = <1>; + vsync-len = <10>; + hback-porch = <43>; + vback-porch = <12>; + hfront-porch = <8>; + vfront-porch = <4>; + }; + + def-back-color-red = <0xFF>; + def-back-color-green = <0xFF>; + def-back-color-blue = <0xFF>; +}; + +&pll { + div-m = <5>; + mul-n = <192>; + div-p = <2>; + div-q = <4>; + div-r = <4>; + clocks = <&clk_hse>; + status = "okay"; +}; + +&pll3 { + div-m = <5>; + mul-n = <192>; + div-p = <2>; + div-q = <20>; + div-r = <99>; + clocks = <&clk_hse>; + status = "okay"; +}; + +&rcc { + clocks = <&pll>; + clock-frequency = ; + d1cpre = <1>; + hpre = <2>; + d1ppre = <2>; + d2ppre1 = <2>; + d2ppre2 = <2>; + d3ppre = <2>; +}; + +&usart3 { + pinctrl-0 = <&usart3_tx_pb10 &usart3_rx_pb11>; + pinctrl-names = "default"; + current-speed = <115200>; + status = "okay"; +}; + +&quadspi { + pinctrl-names = "default"; + pinctrl-0 = <&quadspi_clk_pf10 &quadspi_bk1_ncs_pg6 + &quadspi_bk1_io0_pd11 &quadspi_bk1_io1_pf9 + &quadspi_bk1_io2_pf7 &quadspi_bk1_io3_pf6 + &quadspi_bk2_io0_ph2 &quadspi_bk2_io1_ph3 + &quadspi_bk2_io2_pg9 &quadspi_bk2_io3_pg14>; + dual-flash; + status = "okay"; + + /* Sector erase 64KB uniform granularity for each Flash */ + /* Subsector erase 4KB, 32KB granularity for each Flash */ + mt25ql512ab1: qspi-nor-flash-1@0 { + compatible = "st,stm32-qspi-nor"; + reg = <0>; + size = ; /* 64MB for each Flash */ + write-block-size = <1>; /* 1byte=4bits*2 in dual-flash mode */ + erase-block-size = ; /* 64KB*2 in dual-flash mode */ + qspi-max-frequency = <72000000>; + cs-high-time = <4>; /* >= 50 ns */ + spi-bus-width = <4>; + reset-cmd; + status = "okay"; + }; + + mt25ql512ab2: qspi-nor-flash-2@0 { + compatible = "st,stm32-qspi-nor"; + reg = <0>; + size = ; /* 64MB */ + qspi-max-frequency = <72000000>; + status = "okay"; + }; +}; + +&fmc { + pinctrl-0 = <&fmc_nbl0_pe0 &fmc_nbl1_pe1 + &fmc_sdclk_pg8 &fmc_sdnwe_ph5 &fmc_sdcke1_ph7 + &fmc_sdne1_ph6 &fmc_sdnras_pf11 &fmc_sdncas_pg15 + &fmc_a0_pf0 &fmc_a1_pf1 &fmc_a2_pf2 &fmc_a3_pf3 &fmc_a4_pf4 + &fmc_a5_pf5 &fmc_a6_pf12 &fmc_a7_pf13 &fmc_a8_pf14 + &fmc_a9_pf15 &fmc_a10_pg0 &fmc_a11_pg1 + &fmc_a14_pg4 &fmc_a15_pg5 &fmc_d0_pd14 &fmc_d1_pd15 + &fmc_d2_pd0 &fmc_d3_pd1 &fmc_d4_pe7 &fmc_d5_pe8 &fmc_d6_pe9 + &fmc_d7_pe10 &fmc_d8_pe11 &fmc_d9_pe12 &fmc_d10_pe13 + &fmc_d11_pe14 &fmc_d12_pe15 &fmc_d13_pd8 &fmc_d14_pd9 + &fmc_d15_pd10>; + pinctrl-names = "default"; + status = "okay"; + + sdram { + status = "okay"; + power-up-delay = <100>; + num-auto-refresh = <8>; + mode-register = <0x230>; + refresh-rate = <0x603>; + + bank@1 { + reg = <1>; + st,sdram-control = ; + st,sdram-timing = <2 7 4 7 2 2 2>; + }; + }; +}; + +&rtc { + clocks = <&rcc STM32_CLOCK(APB4, 16)>, + <&rcc STM32_SRC_LSE RTC_SEL(1)>; + status = "okay"; +}; + +&die_temp { + status = "okay"; +}; + +&adc3 { + st,adc-clock-source = "SYNC"; + st,adc-prescaler = <4>; + status = "okay"; +}; + +/* Arduino Header pins: Tx:D1, Rx:D0 */ +/* LPUART1 can also be used with this pins */ +&usart1 { + dma-names = "tx", "rx"; + pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>; + pinctrl-names = "default"; + current-speed = <115200>; + status = "okay"; +}; diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk.dts b/boards/st/stm32h750b_dk/stm32h750b_dk.dts index b1b79e49ea107..28d2887c8248c 100644 --- a/boards/st/stm32h750b_dk/stm32h750b_dk.dts +++ b/boards/st/stm32h750b_dk/stm32h750b_dk.dts @@ -5,288 +5,38 @@ */ /dts-v1/; -#include -#include -#include "arduino_r3_connector.dtsi" -#include +#include "stm32h750b_dk-common.dtsi" / { model = "STMicroelectronics STM32H750B DISCOVERY KIT"; compatible = "st,stm32h750b-dk"; chosen { - zephyr,console = &usart3; - zephyr,shell-uart = &usart3; - zephyr,sram = &sram0; zephyr,flash = &flash0; - zephyr,flash-controller = &mt25ql512ab1; - zephyr,display = <dc; - zephyr,code-partition = &slot0_partition; + zephyr,flash-controller = &flash; }; - - sdram2: sdram@d0000000 { - compatible = "zephyr,memory-region", "mmio-sram"; - device_type = "memory"; - reg = <0xd0000000 DT_SIZE_M(16)>; /* 128Mbit */ - zephyr,memory-region = "SDRAM2"; - zephyr,memory-attr = ; - }; - - ext_memory: memory@90000000 { - compatible = "zephyr,memory-region"; - reg = <0x90000000 DT_SIZE_M(256)>; /* max addressable area */ - zephyr,memory-region = "EXTMEM"; - /* The ATTR_MPU_EXTMEM attribut causing a MPU FAULT */ - zephyr,memory-attr = ; - }; - - leds { - compatible = "gpio-leds"; - - red_led: led_1 { - gpios = <&gpioi 13 GPIO_ACTIVE_LOW>; - label = "USER1 LD6"; - }; - - green_led: led_2 { - gpios = <&gpioj 2 GPIO_ACTIVE_LOW>; - label = "USER2 LD7"; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - - user_button: button { - label = "User"; - gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>; - zephyr,code = ; - }; - }; - - aliases { - led0 = &green_led; - led1 = &red_led; - sw0 = &user_button; - die-temp0 = &die_temp; - }; -}; - -&clk_hse { - clock-frequency = ; - hse-bypass; - status = "okay"; -}; - -&clk_lse { - status = "okay"; -}; - -&flash0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Flash has 128KB sector size */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 DT_SIZE_K(128)>; - }; - }; -}; - -<dc { - pinctrl-0 = <<dc_r0_pi15 <dc_r1_pj0 <dc_r2_pj1 <dc_r3_ph9 - <dc_r4_pj3 <dc_r5_pj4 <dc_r6_pj5 <dc_r7_pj6 - <dc_g0_pj7 <dc_g1_pj8 <dc_g2_pj9 <dc_g3_pj10 - <dc_g4_pj11 <dc_g5_pi0 <dc_g6_pi1 <dc_g7_pk2 - <dc_b0_pj12 <dc_b1_pj13 <dc_b2_pj14 <dc_b3_pj15 - <dc_b4_pk3 <dc_b5_pk4 <dc_b6_pk5 <dc_b7_pk6 - <dc_de_pk7 <dc_clk_pi14 <dc_hsync_pi12 <dc_vsync_pi9>; - pinctrl-names = "default"; - - disp-on-gpios = <&gpiod 7 GPIO_ACTIVE_HIGH>; - - ext-sdram = <&sdram2>; - status = "okay"; - - clocks = <&rcc STM32_CLOCK(APB3, 3)>, - <&rcc STM32_SRC_PLL3_R NO_SEL>; - - width = <480>; - height = <272>; - pixel-format = ; - - display-timings { - compatible = "zephyr,panel-timing"; - de-active = <1>; - pixelclk-active = <0>; - hsync-active = <0>; - vsync-active = <0>; - hsync-len = <1>; - vsync-len = <10>; - hback-porch = <43>; - vback-porch = <12>; - hfront-porch = <8>; - vfront-porch = <4>; - }; - - def-back-color-red = <0xFF>; - def-back-color-green = <0xFF>; - def-back-color-blue = <0xFF>; -}; - -&pll { - div-m = <5>; - mul-n = <192>; - div-p = <2>; - div-q = <4>; - div-r = <4>; - clocks = <&clk_hse>; - status = "okay"; -}; - -&pll3 { - div-m = <5>; - mul-n = <192>; - div-p = <2>; - div-q = <20>; - div-r = <99>; - clocks = <&clk_hse>; - status = "okay"; -}; - -&rcc { - clocks = <&pll>; - clock-frequency = ; - d1cpre = <1>; - hpre = <2>; - d1ppre = <2>; - d2ppre1 = <2>; - d2ppre2 = <2>; - d3ppre = <2>; -}; - -&usart3 { - pinctrl-0 = <&usart3_tx_pb10 &usart3_rx_pb11>; - pinctrl-names = "default"; - current-speed = <115200>; - status = "okay"; }; &quadspi { - pinctrl-names = "default"; - pinctrl-0 = <&quadspi_clk_pf10 &quadspi_bk1_ncs_pg6 - &quadspi_bk1_io0_pd11 &quadspi_bk1_io1_pf9 - &quadspi_bk1_io2_pf7 &quadspi_bk1_io3_pf6 - &quadspi_bk2_io0_ph2 &quadspi_bk2_io1_ph3 - &quadspi_bk2_io2_pg9 &quadspi_bk2_io3_pg14>; - dual-flash; status = "okay"; - /* Sector erase 64KB uniform granularity */ - /* Subsector erase 4KB, 32KB granularity */ mt25ql512ab1: qspi-nor-flash-1@0 { - compatible = "st,stm32-qspi-nor"; - reg = <0>; - size = ; /* 512 Mbits */ - qspi-max-frequency = <72000000>; - cs-high-time = <4>; /* >= 50 ns */ - spi-bus-width = <4>; - reset-cmd; status = "okay"; + /* 128MB total in dual-flash mode */ partitions { compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; - 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 { + storage_partition: partition@0 { label = "storage"; - reg = <0x00400000 DT_SIZE_K(128)>; + reg = <0x00000000 DT_SIZE_M(128)>; /* 128MB */ }; }; }; mt25ql512ab2: qspi-nor-flash-2@0 { - compatible = "st,stm32-qspi-nor"; - reg = <0>; - size = ; /* 512 Mbits */ - qspi-max-frequency = <72000000>; - status = "okay"; - }; -}; - -&fmc { - pinctrl-0 = <&fmc_nbl0_pe0 &fmc_nbl1_pe1 - &fmc_sdclk_pg8 &fmc_sdnwe_ph5 &fmc_sdcke1_ph7 - &fmc_sdne1_ph6 &fmc_sdnras_pf11 &fmc_sdncas_pg15 - &fmc_a0_pf0 &fmc_a1_pf1 &fmc_a2_pf2 &fmc_a3_pf3 &fmc_a4_pf4 - &fmc_a5_pf5 &fmc_a6_pf12 &fmc_a7_pf13 &fmc_a8_pf14 - &fmc_a9_pf15 &fmc_a10_pg0 &fmc_a11_pg1 - &fmc_a14_pg4 &fmc_a15_pg5 &fmc_d0_pd14 &fmc_d1_pd15 - &fmc_d2_pd0 &fmc_d3_pd1 &fmc_d4_pe7 &fmc_d5_pe8 &fmc_d6_pe9 - &fmc_d7_pe10 &fmc_d8_pe11 &fmc_d9_pe12 &fmc_d10_pe13 - &fmc_d11_pe14 &fmc_d12_pe15 &fmc_d13_pd8 &fmc_d14_pd9 - &fmc_d15_pd10>; - pinctrl-names = "default"; - status = "okay"; - - sdram { status = "okay"; - power-up-delay = <100>; - num-auto-refresh = <8>; - mode-register = <0x230>; - refresh-rate = <0x603>; - - bank@1 { - reg = <1>; - st,sdram-control = ; - st,sdram-timing = <2 7 4 7 2 2 2>; - }; }; }; - -&rtc { - clocks = <&rcc STM32_CLOCK(APB4, 16)>, - <&rcc STM32_SRC_LSE RTC_SEL(1)>; - status = "okay"; -}; - -&die_temp { - status = "okay"; -}; - -&adc3 { - st,adc-clock-source = "SYNC"; - st,adc-prescaler = <4>; - status = "okay"; -}; - -/* Arduino Header pins: Tx:D1, Rx:D0 */ -/* LPUART1 can also be used with this pins */ -&usart1 { - dma-names = "tx", "rx"; - pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>; - pinctrl-names = "default"; - current-speed = <115200>; - status = "okay"; -}; diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.dts b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.dts new file mode 100644 index 0000000000000..fc6be482127df --- /dev/null +++ b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.dts @@ -0,0 +1,69 @@ +/* + * SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/dts-v1/; +#include "stm32h750b_dk-common.dtsi" + +/ { + model = "STMicroelectronics STM32H750B DISCOVERY KIT"; + compatible = "st,stm32h750b-dk"; + + chosen { + zephyr,flash = &mt25ql512ab1; + zephyr,flash-controller = &mt25ql512ab1; + zephyr,code-partition = &slot0_partition; + }; +}; + +&flash0 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* Flash has 128KB sector size */ + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(128)>; + }; + }; +}; + +&quadspi { + status = "okay"; + + mt25ql512ab1: qspi-nor-flash-1@0 { + status = "okay"; + + /* 128MB total in dual-flash mode */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot0_partition: partition@0 { + label = "image-0"; + reg = <0x00000000 DT_SIZE_M(60)>; /* 60MB */ + }; + + slot1_partition: partition@200000 { + label = "image-1"; + reg = <0x00200000 DT_SIZE_M(60)>; + }; + + storage_partition: partition@400000 { + label = "storage"; + reg = <0x00400000 DT_SIZE_M(8)>; + }; + }; + }; + + mt25ql512ab2: qspi-nor-flash-2@0 { + status = "okay"; + }; +}; diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.yaml b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.yaml new file mode 100644 index 0000000000000..8a60cc61f7d08 --- /dev/null +++ b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app.yaml @@ -0,0 +1,19 @@ +identifier: stm32h750b_dk/stm32h750xx/ext_flash_app +name: ST STM32H750B Discovery Kit with App in Ext Flash +type: mcu +arch: arm +toolchain: + - zephyr +sysbuild: true +ram: 1024 +flash: 61440 +supported: + - arduino_gpio + - gpio + - dma + - flash + - rtc + - memc + - display + - spi +vendor: st diff --git a/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app_defconfig b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app_defconfig new file mode 100644 index 0000000000000..d83635f818826 --- /dev/null +++ b/boards/st/stm32h750b_dk/stm32h750b_dk_stm32h750xx_ext_flash_app_defconfig @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors +# SPDX-License-Identifier: Apache-2.0 + +# Enable the internal SMPS regulator +CONFIG_POWER_SUPPLY_LDO=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# Enable HW stack protection +CONFIG_HW_STACK_PROTECTION=y + +CONFIG_SERIAL=y + +# console +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y + +# enable GPIO +CONFIG_GPIO=y diff --git a/dts/bindings/flash_controller/st,stm32-qspi-nor.yaml b/dts/bindings/flash_controller/st,stm32-qspi-nor.yaml index 96def5483903b..a6d58adae11ff 100644 --- a/dts/bindings/flash_controller/st,stm32-qspi-nor.yaml +++ b/dts/bindings/flash_controller/st,stm32-qspi-nor.yaml @@ -19,7 +19,7 @@ description: | compatible: "st,stm32-qspi-nor" -include: ["flash-controller.yaml", "jedec,jesd216.yaml"] +include: ["flash-controller.yaml", "jedec,jesd216.yaml", "soc-nv-flash.yaml"] on-bus: qspi diff --git a/samples/sysbuild/with_mcuboot/sample.yaml b/samples/sysbuild/with_mcuboot/sample.yaml index bdd79980ed298..5797bb823c135 100644 --- a/samples/sysbuild/with_mcuboot/sample.yaml +++ b/samples/sysbuild/with_mcuboot/sample.yaml @@ -18,6 +18,7 @@ tests: - nucleo_u385rg_q - stm32h7s78_dk - stm32h573i_dk + - stm32h750b_dk/stm32h750xx/ext_flash_app integration_platforms: - nrf52840dk/nrf52840 - esp32_devkitc/esp32/procpu diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml index 2af749005db14..6cfb6d1b8de1a 100644 --- a/tests/boot/test_mcuboot/testcase.yaml +++ b/tests/boot/test_mcuboot/testcase.yaml @@ -54,12 +54,14 @@ tests: - esp32c3_devkitm - esp32c6_devkitc/esp32c6/hpcore - esp8684_devkitm + - stm32h750b_dk/stm32h750xx/ext_flash_app integration_platforms: - frdm_k64f - nrf52840dk/nrf52840 bootloader.mcuboot.assert: platform_allow: - b_u585i_iot02a + - stm32h750b_dk/stm32h750xx/ext_flash_app extra_configs: - CONFIG_ASSERT=y bootloader.mcuboot.swap_using_move: @@ -68,6 +70,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf52840dk/nrf52840 - nucleo_wba55cg + - stm32h750b_dk/stm32h750xx/ext_flash_app integration_platforms: - frdm_k64f - nrf5340dk/nrf5340/cpuapp diff --git a/west.yml b/west.yml index c36b20ec94fb9..8627d5f24b988 100644 --- a/west.yml +++ b/west.yml @@ -23,6 +23,8 @@ manifest: url-base: https://github.com/zephyrproject-rtos - name: babblesim url-base: https://github.com/BabbleSim + - name: mcuboot_upstream + url-base: https://github.com/mcu-tools group-filter: [-babblesim, -optional] @@ -321,7 +323,8 @@ manifest: groups: - crypto - name: mcuboot - revision: d5b0dcb9aaee397fc105ae2228e8030038c3d871 + remote: mcuboot_upstream + revision: pull/2479/head path: bootloader/mcuboot groups: - bootloader