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.

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

T91x serial recovery single image #310

Draft
wants to merge 78 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b137da6
[nrf fromtree] zcbor: Copy source and header files
oyvindronningstad Jan 10, 2024
0c539f6
[nrf fromtree] zcbor: Add copy notice to all copied files
oyvindronningstad Jan 10, 2024
fc20e9b
[nrf fromtree] boot_serial: Adapt to API changes in zcbor 0.8.0
oyvindronningstad Jan 10, 2024
e5d5708
[nrf fromtree] zcbor: Copy source and header files
oyvindronningstad Jan 26, 2024
9e03ad4
[nrf fromtree] boot_serial: Adapt to zcbor 0.8.x
oyvindronningstad Jan 29, 2024
df01761
[nrf fromtree] boot: zephyr: moonlight watchdogs
michalek-no Jan 9, 2024
27fc8d7
[nrf fromtree] zephyr: Add NRF54L configuration
michalek-no Nov 22, 2023
6a9b75f
[nrf fromlist] zephyr/boards: nrf54l15pdk_nrf54l15_cpuapp config
nvlsianpu Feb 15, 2024
f82a032
[nrf fromtree] boot: Fix swap-move algorithm failing to validate mult…
de-nordic Feb 1, 2024
4d7e568
[nrf noup] ci: add downstream-only NCS customizations
thst-nordic Nov 23, 2018
786e351
[nrf noup] github: Add a commit tags check workflow
carlescufi Oct 10, 2023
5c94965
[nrf noup] zephyr: Remove duplication from cmake
sigvartmh Mar 26, 2019
64740f7
[nrf noup] zephyr: add 'minimal' configuration files
mbolivar-nordic Sep 3, 2021
de32681
[nrf noup] boards: add support for Thingy:91
bjda Sep 20, 2019
5cf8423
[nrf noup] loader: work-around for multi-image builds
sigvartmh Mar 30, 2021
55683e3
[nrf noup] boot: Add shared crypto for ECDSA and SHA
sigvartmh Feb 14, 2019
ba55561
[nrf noup] crypto: ecdsa: Add required signature decoding
de-nordic Apr 21, 2023
a0c21e2
[nrf noup] crypto: ecdsa: Fix shared crypto MCUBoot EXT_ABI
sigvartmh Oct 10, 2023
fcd7281
[nrf noup] zephyr: Set at least provide EXT_API
Vge0rge Nov 8, 2021
a01d30a
[nrf noup] zephyr: Restore default RTC user channel count
Damian-Nordic Mar 21, 2022
80016fd
[nrf noup] treewide: add NCS partition manager support
SebastianBoe Dec 12, 2018
2009587
[nrf noup] boot: nrf53-specific customizations
sigvartmh Aug 27, 2020
1b0aa58
[nrf noup] zephyr: clean peripherals state before boot
nvlsianpu Feb 27, 2020
83bc352
[nrf noup] zephyr: Clean up non-secure RAM if enabled
sigvartmh Jan 6, 2023
5bdac09
[nrf noup] loader: Fix reading reset addr to support ext flash
chrta Feb 10, 2022
d9d3804
[nrf noup] zephyr: Fix path variables
nordicjm Jul 11, 2023
6024d0a
[nrf noup] loader: Fix missing PCD define check
nordicjm Aug 31, 2023
b4464ad
[nrf noup] boot: Add support for NSIB and multi-image
sigvartmh May 31, 2023
418b6fe
[nrf noup] sysflash: Move partition manager definitions to pm_sysflash.h
de-nordic Aug 10, 2023
7b87633
[nrf noup] sysflash: Add support for three images
de-nordic Aug 11, 2023
8e373cc
[nrf noup] loader: Do not check reset vector for XIP image
de-nordic Sep 22, 2023
90a91e0
[nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild
nordicjm Sep 18, 2023
4b36f9f
[nrf noup] zephyr: Boot even if EXT_ABI is not provided
sigvartmh Oct 17, 2023
c5aadd7
[nrf noup] loader: Add firmware version check downgrade prevention
sigvartmh Sep 27, 2023
ed3a0c2
[nrf noup] loader: introduced cleanup of unusable secondary slot
nvlsianpu Feb 15, 2024
8bb8567
[nrf noup] boards: thingy53: disable GPIO ISR support
nika-nordic Oct 9, 2023
3c2f2ff
[nrf noup] boards: thingy91x: add board config
maxd-nordic Dec 8, 2023
f44f042
Revert "[nrf noup] boards: thingy53: disable GPIO ISR support"
rlubos Mar 11, 2024
c56303f
Revert "[nrf noup] loader: introduced cleanup of unusable secondary s…
rlubos Mar 11, 2024
5f9c2d5
Revert "[nrf noup] loader: Add firmware version check downgrade preve…
rlubos Mar 11, 2024
50962cb
Revert "[nrf noup] zephyr: Boot even if EXT_ABI is not provided"
rlubos Mar 11, 2024
ba7dd6f
Revert "[nrf noup] zephyr: Add RAM flash configuration to cache for s…
rlubos Mar 11, 2024
fa880e6
Revert "[nrf noup] loader: Do not check reset vector for XIP image"
rlubos Mar 11, 2024
08439d8
Revert "[nrf noup] sysflash: Add support for three images"
rlubos Mar 11, 2024
761738c
Revert "[nrf noup] sysflash: Move partition manager definitions to pm…
rlubos Mar 11, 2024
97e049b
Revert "[nrf noup] boot: Add support for NSIB and multi-image"
rlubos Mar 11, 2024
3aafd78
Revert "[nrf noup] loader: Fix missing PCD define check"
rlubos Mar 11, 2024
69006ec
Revert "[nrf noup] zephyr: Fix path variables"
rlubos Mar 11, 2024
4fa8d28
Revert "[nrf noup] loader: Fix reading reset addr to support ext flash"
rlubos Mar 11, 2024
959ddb9
Revert "[nrf noup] zephyr: Clean up non-secure RAM if enabled"
rlubos Mar 11, 2024
666eaed
Revert "[nrf noup] zephyr: clean peripherals state before boot"
rlubos Mar 11, 2024
ed6a957
Revert "[nrf noup] boot: nrf53-specific customizations"
rlubos Mar 11, 2024
710ca46
Revert "[nrf noup] treewide: add NCS partition manager support"
rlubos Mar 11, 2024
57e0fc7
Revert "[nrf fromtree] boot: zephyr: moonlight watchdogs"
rlubos Mar 11, 2024
b2e6ef5
Revert "[nrf fromtree] boot_serial: Adapt to zcbor 0.8.x"
rlubos Mar 11, 2024
4e40746
Revert "[nrf fromtree] zcbor: Copy source and header files"
rlubos Mar 11, 2024
3885aab
Revert "[nrf fromtree] boot_serial: Adapt to API changes in zcbor 0.8.0"
rlubos Mar 11, 2024
d490bed
Revert "[nrf fromtree] zcbor: Add copy notice to all copied files"
rlubos Mar 11, 2024
a8c9844
Revert "[nrf fromtree] zcbor: Copy source and header files"
rlubos Mar 11, 2024
4b6c0dd
[nrf mergeup] Merge upstream up to commit a4eda30f5b0cfd0cf15512be9dc…
rlubos Mar 11, 2024
518617a
[nrf noup] treewide: add NCS partition manager support
SebastianBoe Dec 12, 2018
42e43d0
[nrf noup] boot: nrf53-specific customizations
sigvartmh Aug 27, 2020
3b2a5ba
[nrf noup] zephyr: clean peripherals state before boot
nvlsianpu Feb 27, 2020
047d463
[nrf noup] zephyr: Clean up non-secure RAM if enabled
sigvartmh Jan 6, 2023
2dac63a
[nrf noup] loader: Fix reading reset addr to support ext flash
chrta Feb 10, 2022
c28fa1d
[nrf noup] zephyr: Fix path variables
nordicjm Jul 11, 2023
f577000
[nrf noup] loader: Fix missing PCD define check
nordicjm Aug 31, 2023
22ed9fb
[nrf noup] boot: Add support for NSIB and multi-image
sigvartmh May 31, 2023
f013888
[nrf noup] sysflash: Move partition manager definitions to pm_sysflash.h
de-nordic Aug 10, 2023
d3f55fe
[nrf noup] sysflash: Add support for three images
de-nordic Aug 11, 2023
d798de3
[nrf noup] loader: Do not check reset vector for XIP image
de-nordic Sep 22, 2023
af27205
[nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild
nordicjm Sep 18, 2023
41cc274
[nrf noup] zephyr: Boot even if EXT_ABI is not provided
sigvartmh Oct 17, 2023
8e91ec1
[nrf noup] loader: Add firmware version check downgrade prevention
sigvartmh Sep 27, 2023
3b0eac8
[nrf noup] loader: introduced cleanup of unusable secondary slot
nvlsianpu Feb 15, 2024
86af2de
[nrf noup] boards: thingy53: disable GPIO ISR support
nika-nordic Oct 9, 2023
89175fa
[nrf noup] boards: thingy91x: enable serial recovery
maxd-nordic Mar 12, 2024
81fb5fc
wip
maxd-nordic Apr 24, 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
Prev Previous commit
Next Next commit
[nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild
Puts the flash simulation configurtion into cache variables that can
be used by other applications and CMake code to know specifics on
the simulated flash details

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit c19337f)
(cherry picked from commit 90a91e0)
Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
nordicjm authored and rlubos committed Mar 11, 2024
commit af27205c904fa5eee91eb3a9cec3a1eea939b4aa
11 changes: 11 additions & 0 deletions boot/zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -525,3 +525,14 @@ zephyr_library_sources(
${BOOT_DIR}/zephyr/nrf_cleanup.c
)
endif()

if(SYSBUILD AND CONFIG_PCD_APP)
# Sysbuild requires details of the RAM flash device are stored to the cache of MCUboot so
# that they can be read when running partition manager
dt_nodelabel(ram_flash_dev NODELABEL flash_sim0)
dt_reg_addr(ram_flash_addr PATH ${ram_flash_dev})
dt_reg_size(ram_flash_size PATH ${ram_flash_dev})

set(RAM_FLASH_ADDR "${ram_flash_addr}" CACHE STRING "" FORCE)
set(RAM_FLASH_SIZE "${ram_flash_size}" CACHE STRING "" FORCE)
endif()