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

Jump to bottom

fix sysbuild custom sign #20

Closed
wants to merge 35 commits into from
Closed

fix sysbuild custom sign #20

wants to merge 35 commits into from

Conversation

gchwier
Copy link

@gchwier gchwier commented May 20, 2024

Fixes an issue with custom signing method. Default public key was used instead of key given with KConfig.

Tested with command:

west build --sysbuild --pristine -b nrf5340dk/nrf5340/cpuapp  ${ZEPHYR_BASE}/samples/hello_world -- \
-DCONFIG_SECURE_BOOT=y -DSB_CONFIG_SECURE_BOOT=y -DSB_CONFIG_SECURE_BOOT_APPCORE=y -Db0_SB_CRYPTO_CC310_ECDSA_SECP256R1=y \
 -Db0_SB_CRYPTO_CC310_SHA256=y \
 -DSB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM=y \
 -DSB_CONFIG_SECURE_BOOT_SIGNING_PUBLIC_KEY=\"$TOP_LVL_BOOTLOADER_REPOSITORY/conf/keys/public/valid_key_1.pem\" \
 -DSB_CONFIG_SECURE_BOOT_SIGNING_COMMAND=\""python3 $NCS_BASE/nrf/scripts/bootloader/do_sign.py --private-key  $TOP_LVL_BOOTLOADER_REPOSITORY/conf/keys/private/valid_key_1.pem --in"\"

nordicjm and others added 30 commits May 17, 2024 14:34
@nordicjm
cmake: sysbuild: image_signing: Fix not using python
f72f940 
Fixes an issue with python not be directly used to run the
imgtool program to sign images

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: kconfig: Deprioritise empty network core image
ec3eb4f 
Deprioritises the empty network core image, this is to allow the
thingy53 board to always have it selected

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Fix wrongly enabling ECDSA P256 for MCUboot by default
9ba0306 
Fixes wrongly enabling this mode for MCUboot when it should only
have been enabled by default on devices with hardware cryptocell,
with some exclusions

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Change multi image configuration errors to warnings
845932e 
Changes from fatal error to warning level when issues with
sysbuild multi image configuration is detected so that builds
can be fixed

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add support for nrf9161dk
3f362d9 
Adds support for using the nrf9161dk target board

Signed-off-by: Jamie McCrae <[email protected]>
@tomchy @nordicjm
dfu_target_stream: Add progress cleanup
54246cb 
It is necessary to erase progress for both streams before test
execution.
Remove the bootloader from sysbuild as the bootloader is not required by
the test.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
@nordicjm
sysbuild: Add external flash functionality
fa1c3d9 
Adds the external flash functionality from child/parent image
partition manager

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
bootloader: Reduce slots if image is MCUboot
6cf9e5d 
Reduces the number of slots if the current image is MCUboot as
this configuration is no longer stored in the application in
sysbuild

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Fix trustedfirmare-m
2644015 
Fixes an issue of not using the correct file when building TF-M
test projects

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
cmake: sysbuild: Add missing BYPRODUCT variables
2180e1d 
Adds missing BYPRODUCT_* cache variables which are used to store
the name of the signed files. Also fixes not updating the flash
runner hex file for variant images

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
samples/applications/tests: Add sysbuild configurations
c86ebd8 
Adds sysbuild configurations to samples, applications and tests
which replaces child/parent image builds

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add dependencies on some image config files
981b101 
Adds dependencies on some image .config files so that sysbuild
cmake reruns after these files have changed, to avoid stick
configuration being stuck when sysbuild previously read Kconfig
values

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add bluetooth mesh DFU metadata support
dcb40e5 
Adds bluetooth mesh DFU metadata output support to app_update.zip

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
boards: nrf7002dk: Enable wifi by default
4758910 
Enables wifi by default in sysbuild for this board

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Exclude boards from partition manager
ee073e8 
Excludes partition manager for all nrf54h20dk board targets

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add support for matter factory data
550fc09 
Adds support for outputting matter factory data using sysbuild

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
samples/applications: matter: Enable factory data
d592c3f 
Enables factory data output for sysbuild builds

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
tests: dfu: dfu_target: Rename test
eee5dee 
Renames the test to avoid a conflict with an MCUboot sysbuild
cmake file

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Switch to SoCs instead of boards
255a8e6 
Switches to using SoCs instead of boards, this allows any nrf5340
or nrf91x-based board to make use of things like network core
images and secure boot

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add preliminary support for nrf700x patches
c90a0e6 
Adds initial support for loading nRF700x patches from QSPI

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
boards: thingy91: Add initial sysbuild options
0c53766 
Adds initial sysbuild options for partition layout

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
cmake: sysbuild: Fix partition manager not escaping variables
dcd1a0d 
Fixes an inconsistency with sysbuild's partition manager not
escaping variables that child/parent image would

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
manifest: Update find-my, sidewalk and zephyr
343df7c 
Updates find-my, sidewalk and zephyr to include sysbuild support

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
cmake: Add deprecation wwarning to child/parent image
c414fdc 
Adds a deprecation warning that describes that child/parent image
has been replaced with sysbuild and when the feature will be
removed entirely

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
applications: nrf5340_audio: Change build type to file suffix
4d7b07f 
Changes from the deprecated build type to file suffix

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
doc: Change build type to file suffix
d37cf75 
Changes from the deprecated build type to file suffix

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Add support for dfu_application.zip output
d75de35 
Adds support for generating an update zip file

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
cmake: sysbuild: Fix b0 signing
1c4401f 
Fixes b0 signing to work for both application and network core
images, and to only generate the dfu_mcuboot.zip if it is an
MCUboot image

Signed-off-by: Jamie McCrae <[email protected]>
@ArekBalysNordic @nordicjm
sysbuild: Add support for Matter OTA
75dfd95 
Added support for Matter OTA firmware update to sysbuild.

Signed-off-by: Arkadiusz Balys <[email protected]>
@nordicjm
sysbuild: Quieten invalid warning messages
da83d29 
Queitens invalid warning messages that run at wrong times from
the child/parent image to sysbuild transition

Signed-off-by: Jamie McCrae <[email protected]>
jangalda-nsc and others added 5 commits May 17, 2024 14:34
@jangalda-nsc @nordicjm
tools: Use ncs-build image based on ubuntu 22
8c94f57 
Use ncs-build image based on ubuntu 22.04. It contains gcc 11 needed for
twister tests on native simulator.

Signed-off-by: Jan Gałda <[email protected]>
@nordicjm
applications/samples/tests: Remove child/parent configuration
5f691bb 
Removes child and parent image folders as these are no longer used

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
tests: Add some deprecated child/parent image builds
77ab259 
Adds some child and parent image builds without sysbuild to ensure
features remain working until the feature is fully removed

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
cmake: bootloader: Only include dummy values when testing
9ec27c6 
Only includes dummy values for the secure boot bootloader when
partition manager is disabled

Signed-off-by: Jamie McCrae <[email protected]>
@gchwier
cmake: sysbuild: image_signing: Fix custom signing
53da5b3 
Fixes an issue with custom signing method. Default public
key was used instead of key given with KConfig.

Signed-off-by: Grzegorz Chwierut <[email protected]>
@gchwier gchwier requested a review from nordicjm as a code owner May 20, 2024 14:15
@gchwier gchwier closed this May 22, 2024
@gchwier
Copy link
Author

gchwier commented May 22, 2024 •
edited
Loading

fixed now

@gchwier gchwier deleted the grch_fix_sysbuild_custom_sign branch May 22, 2024 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordicjm nordicjm Awaiting requested review from nordicjm

Assignees
No one assigned
Labels
changelog-entry-required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gchwier @nordicjm @tomchy @ArekBalysNordic @jangalda-nsc