Duplicates #32
Open
Duplicates #32
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The SC indication can be sent only if the GATT Service Changed is enabled in the configuration. Change fixes build issues related to implicit sc_indicate declaration when Service Changed is disabled. Fixes: #54813 Signed-off-by: Marek Pieta <[email protected]> (cherry picked from commit aed165d)
Fixes a bug introduced in the previous refactoring: we would always mark all peers as change-unaware. Now we only do so when the hash has been recalculated. Signed-off-by: Jonathan Rico <[email protected]> (cherry picked from: 5d46a0c)
… bonding On bond establishment: save the CF and CCC data that have been written before the peer was bonded. On identity resolved: update the CF data to use the peer's identity address instead of its private address (same as is currently done for the CCC). Fixes #54770. Signed-off-by: Jonathan Rico <[email protected]> (cherry picked from a0614b6)
…ring CCC and CF Change removes GATT Client dependency for storing CCC and CF on pairing complete and identity resolved. These features are needed also if GATT Client role is disabled. Signed-off-by: Marek Pieta <[email protected]> (cherry picked from 32e534c)
In TF-M 1.7.0 release the Library model has been removed. Remove the library model support from zephyr before updating TF-M version. Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit 2572a53) Signed-off-by: Joakim Andersson <[email protected]>
Update TF-M from 1.6.0 to 1.7.0 Update MBedTLS from 3.1.0 to 3.2.1. Updates the cmake wrapper for changes introduced in TF-M 1.7.0. Signed-off-by: Kevin Townsend <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit 186cd65) Signed-off-by: Joakim Andersson <[email protected]>
Add SFN model configurations to samples. Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit 2ba39d8) Signed-off-by: Joakim Andersson <[email protected]>
Removes the `psa_firmware` sample, which is based on an older version (0.7) of the FWU service from TF-M 1.6.0. This sample needs to be refactored to use FWU 1.0, included in TF-M 1.7.0 and future releases. Signed-off-by: Kevin Townsend <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit a50aafd) Signed-off-by: Joakim Andersson <[email protected]>
Removes the `psa_crypto` sample from the current release, due to PSA API conflicts that can not be immediately resolved between Zephyr's instance of MbedTLS in the NS environment, and the TF-M PSA APIs included when building with TF-M support. PSA API changes upstream in MbedTLS 3.2.1 (used by TF-M 1.7.0), and MbedTLS 3.1 (used in TF-M 1.6.0) need to be be resolved in both upstream projects before this sample can be reintroduced. Signed-off-by: Kevin Townsend <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit c63fb21) Signed-off-by: Joakim Andersson <[email protected]>
Update the sample to be compatible with API changes introduced in TF-M 1.7.0, adding a new direct call to the PSA Crypto API to generate random data, and cleaning up existing functions for compatibility sake. Signed-off-by: Kevin Townsend <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit dd12dfb) Signed-off-by: Joakim Andersson <[email protected]>
… NS API source Add TF-M connection based NCS API source file to build. This file is needed when a secure service is using connection based method. Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit d9b6e58) Signed-off-by: Joakim Andersson <[email protected]>
…1.7.0 Update TF-M secure partition sample for TF-M 1.7.0. Removes the support for Library model in the sample. Updates to using PSA framework 1.1. Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit 8cfa0f4) Signed-off-by: Joakim Andersson <[email protected]>
The AN547 no longer functions with this TF-M sample, and has been broken since TF-M 1.6.0 without CI catching the issue, since this sample wasn't modified to cause a CI run on the affected target. Removing this board from the sample until the board support can be reworked. Signed-off-by: Kevin Townsend <[email protected]> Signed-off-by: David Brown <[email protected]> (cherry picked from commit d3d80e8) Signed-off-by: Joakim Andersson <[email protected]>
…ptions Fix setting of TF-M floating point options when floating point is enabled in the application. FP design in Armv8.0-M architecture requires consistent FP ABI types between SPE and NSPE. (cherry picked from commit 5c97bb5) Signed-off-by: Joakim Andersson <[email protected]>
… cmake option Remove setting of the TFM_LIB_MODEL option for IPC and SFN models. This option is removed together with the library model. (cherry picked from commit df12df3) Signed-off-by: Joakim Andersson <[email protected]>
…platform partition The TF-M platform partition has now been ported to PSA firmware framework 1.1 and can now be used together with the SFN model. (cherry picked from commit 36421f2) Signed-off-by: Joakim Andersson <[email protected]>
Prevents Zephyr from enabling the initial attestation service in TF-M, due to a dependency it has on an incompatibly-licensed library (QCBOR). This update checks if either of the following config flags are enabled at build time: - `CONFIG_TFM_PARTITION_INITIAL_ATTESTATION` - `CONFIG_TFM_PSA_TEST_INITIAL_ATTESTATION` If either of these are set to true, a fatal error will be thrown at build time, indicating the reason for the failure. This change can be reverted once a longer term solution to the QCBOR license issues has been resolved. Signed-off-by: Kevin Townsend <[email protected]> (cherry picked from commit cd8d4cc) Signed-off-by: Joakim Andersson <[email protected]>
Disables the initial attestation suite, which we are unable to run at present due to a license issue with the underlying QCBOR library which this service depends on in TF-M. This commit can be reverted once an acceptable solution has been found for the QCBOR license in TF-M. Signed-off-by: Kevin Townsend <[email protected]> (cherry picked from commit 0798375) Signed-off-by: Joakim Andersson <[email protected]>
Includes changes to allow Zephyr to avoid building the initial attestation service at build time. Signed-off-by: Kevin Townsend <[email protected]> (cherry picked from commit a79d208) Signed-off-by: Joakim Andersson <[email protected]>
…qcbor TF-M QCBOR cannot be shipped with Zephyr. Allow the application to supply their own copy of QCBOR or let the TF-M build system automatically download this dependency. Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit dd47f4c) Signed-off-by: Joakim Andersson <[email protected]>
… test 221 fix Crypto test-case 221 has a false negative, not passing because the ECC family is disabled, not because of the key length. Increase the timeout for the nRF5340/nRF9160 devices. RSA keygen will sometimes take more than 90 seconds Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit 77c149b) Signed-off-by: Joakim Andersson <[email protected]>
…ptional Added an option to disable and enable the continuous and optional carrier functions in the nordic 802.15.4 driver. Signed-off-by: Artur Hadasz <[email protected]> (cherry picked from commit 5ec2958)
This commit updates hal_nordic revision to bring the latest changes in nRF IEEE 802.15.4 radio driver. Signed-off-by: Artur Hadasz <[email protected]> (cherry picked from commit 505b60f)
Fixes issue where randomness can be removed for advertising sets that have to handle other adv types than the BT_MESH_FRIEND_ADV tag type. Signed-off-by: Anders Storrø <[email protected]>
This commit updates the pull request assigner workflow to use the Ubuntu 22.04 virtual environment. Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Stephanos Ioannidis <[email protected]> (cherry picked from commit e701ec5)
This commit updates the manifest workflow to use the Ubuntu 22.04 virtual environment. Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Stephanos Ioannidis <[email protected]> (cherry picked from commit 44a8b70)
…ment" This reverts commit d8956dc. Signed-off-by: Johann Fischer <[email protected]>
…ment" This reverts commit f576597. Signed-off-by: Johann Fischer <[email protected]>
This reverts commit e414f08. Signed-off-by: Johann Fischer <[email protected]>
…s made optional" This reverts commit 62e3fbe. Signed-off-by: Johann Fischer <[email protected]>
This reverts commit be0edbe. Signed-off-by: Johann Fischer <[email protected]>
…oards" This reverts commit 8e557a1. Signed-off-by: Johann Fischer <[email protected]>
Merge upstream up to commit '6d9adf2e8af' Signed-off-by: Johann Fischer <[email protected]>
Enabling USB CDC by default in Thingy:53 board configuration caused that there were two instances of USB CDC in MCUBoot. Change disables one instance which was added automatically by NCS if MCUBoot bootloader was built as a child image. Jira: NCSDK-18596 Signed-off-by: Mateusz Kapala <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 4eb2da0) (cherry picked from commit 71229dd)
Enable TF-M by default for nordic nRF5340 and nrf9160 SoC boards. NCSDK-14811 Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Jamie McCrae <[email protected]> Signed-off-by: Alex Tsamakos <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 3e72cbb) (cherry picked from commit 707ff27) (cherry picked from commit 8e557a1)
Change enables MCUboot bootloader by default to allow programming samples and applications without external programmer (using MCUboot serial recovery). Change also enables network core to prevent build failures when building MCUboot with nRF53 multi image DFU. Jira: NCSDK-18263 Signed-off-by: Marek Pieta <[email protected]> Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 4771258) (cherry picked from commit be0edbe)
The commit adds bootutil hook, for nrf5340, to allow it handling the non-accessible image-1/primary slot. Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 5507eaa) (cherry picked from commit 87784a6)
If WPA supplicant is enabled at build time, then use the WPA supplicant APIs, else use offload driver APIs. Use z_wpa_supplicant as the name space. Signed-off-by: Krishna T <[email protected]> Signed-off-by: Tomasz Moń <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 2104c26) (cherry picked from commit be420be) (cherry picked from commit 1767131) (cherry picked from commit 5ec011d)
Added definitions for Arduino headers and MCUboot button and LED. Signed-off-by: Kristoffer Rist Skøien <[email protected]> (cherry picked from commit ee2c367)
…r audio codec The board embeds an audio codec IC, Cirrus CS42L73. While there is no in-tree driver for it, we need a binding to describe how it is wired in the board, e.g. for IRQ/RESET lines. Following Linux binding for the same IC, create one in dts/bindings/sound. Note that Linux binding is less complete/outdated. Ref. https://statics.cirrus.com/pubs/proDatasheet/CS47L63_DS1249F2.pdf Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 65512e9)
…scription nRF5340 Audio DK embeds a voltage divider to identify the "board ID". Use the existing 'voltage-divider' binding to describe it. Also configure the ADC channel 0 to read the voltage divider value. Configuration from https://github.com/nrfconnect/sdk-nrf/blob/main/applications/ nrf5340_audio/src/utils/board_version.c has been taken. Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit c1a1108)
… gpio hogs The nRF5340 Audio DK provides a multiplexer circuit that allows to interface the audio codec by an external master. Use GPIO hogs to initialize the multiplexers correctly. Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 20d34bd)
…s disabled In case native IPv6 is disabled, Kconfig entries related to native IPv6 stack should not be enabled. Otherwise, circular dependencies can be created if native stack is disabled, as in case of recent changes in NET_IPV6_RA_RDNSS option (where a dependency for a native stack module was enabled). Signed-off-by: Robert Lubos <[email protected]> (cherry picked from commit dc8f023)
…ecting When the CIS is connecting we should not allow sending the receiver start ready command. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit b7e2652)
The unicast client would attempt to send the receiver start ready opcode to the server for source ASEs before the CIS was connected, which is a spec violation. The code has been refactored to set a boolean, and then send the receiver start ready opcode on CIS connection instead. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit bdbfcb1)
…d move tfm_merged Move tfm_merged.hex from <build>/tfm_merged.hex to <build>/zephyr/tfm_merged.hex. Use relative path to the runners.yaml hex file. This makes it possible to move the build folder. Example would be to copy out the runners.yaml and tfm_merged.hex file and still be able to call west flash --skip-rebuild. Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit fc54d1ac5c63739e9b044c6a4fa318141d789a81)
In some cases built binary files have different names than "zephyr.hex" files, and for those cases, information about names of file to keep should be taken from runners.yaml file. Moreover if in runners.yaml file exist absolute files paths to binary files, then they should be changed to relative ones. Signed-off-by: Piotr Golyzniak <[email protected]> (cherry picked from commit d98afb1)
- Check OCR when sending CMD58, reject if 0 Signed-off-by: Alexander Svensen <[email protected]> (cherry picked from commit 674e238)
Remove a bad LOG_ERR that should never have been merged. Added the valuet that was logged to the debug log statement. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit cf737b5)
fixup! [nrf noup] mgmt/mcumgr: Bootutil hooks to handle image-1 Migrate to new MCUmgr Kconfig options and change select to imply to allow user to disable BOOT_IMAGE_ACCESS_HOOKS. Signed-off-by: Johann Fischer <[email protected]>
This commit updates the pull request assigner workflow to use the Ubuntu 22.04 virtual environment. Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit e701ec5) (cherry picked from commit f576597)
This commit updates the manifest workflow to use the Ubuntu 22.04 virtual environment. Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Stephanos Ioannidis <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit 44a8b70) (cherry picked from commit d8956dc)
…TLS_DEBUG Allows using MBEDTLS_DEBUG functionality when not using MBEDTLS_BUILTIN. Signed-off-by: Vidar Lillebø <[email protected]> (cherry picked from commit ca3d0c8)
PerMac
force-pushed
the
main
branch
2 times, most recently
from
74c7bca to
60166d9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.