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

fixup! [nrf noup] tree-wide: support NCS Partition Manager (PM) defin… #4

Closed

Conversation

tejlmand
Copy link

…itions

…ll when printing CAN frames"

This reverts commit 4b8240f.
anhmolt and others added 28 commits September 23, 2024 20:03
nrf-squash! [nrf noup] entropy: Add fake entropy nRF PRNG driver

Extend fake entropy to nrf9280pdk.

Signed-off-by: Andreas Moltumyr <[email protected]>
While Partition Manager is enabled, it manages the offset
by itself.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
Demultiplexer was not ready to handle case when log message was
incomplete which was followed by other log messages. Such scenario
could occur if there was a fault that happen during logging of
a message. In that case incomplete message was followed by valid
messages (fault report) and this fault report was not handled
because processing was blocked waiting for completion of a
message which preceeded fault report.

Since it is expected that some messages may be incomplete a
garbage collection mechanism is added. When start of a message is
received timestamp is logged and list of incomplete messages
is checked for 'old' messages which persist in incomplete state
for long. When message timeouts it is closed and marked as
invalid. It unblocks processing of following messages.

Upstream PR: zephyrproject-rtos/zephyr#78333

Signed-off-by: Krzysztof Chruściński <[email protected]>
Apply clang-format formatting.

Upstream PR: zephyrproject-rtos/zephyr#78332

Signed-off-by: Krzysztof Chruściński <[email protected]>
write_data function which was writing to STMESP data registers was
starting by writing words and tail was written using byte access.
However, RISCV core does not support unaligned access and on Cortex-M33
even if supported it is faster to do aligned access. Reworked
write_data to start first by writing data using byte or half word
access until data pointer is word aligned, then word access is used
and finally tail is written using byte or half word access.

Upstream PR: zephyrproject-rtos/zephyr#78332

Signed-off-by: Krzysztof Chruściński <[email protected]>
The list of reserved PPIs by MPSL should be kept if MPSL is enabled.
The 802154 radio driver is not the only user of MPSL.

This commit has been converted from a fromlist to noup.

Signed-off-by: Jonathan Rico <[email protected]>
Signed-off-by: Bjarki Arge Andreasen <[email protected]>
…neric

-This commit prevents legacy mbed TLS configurations from being in
 conflict with PSA Configurations while using nrf_security.
-This [nrf noup] is reworked from an earlier cherry-pick of
 commit d8c96cf, but has the following
 changes:
 - Endif's relevant that is using our pattern for masking
   configs duplicated or in conflict in nrf_security
  (by using if !(NRF_SECURITY || NORDIC_SECURITY_BACKEND)) is
  made clearer by adding a comment at their corresponding endif
  (# !(NRF_SECURITY || NORDIC_SECURITY_BACKEND))
 - Changes to zephyr_init.c for entropy_dev checking for
   CONFIG_NRF_CC3XX_PLATFORM is removed as the symbol entropy_dev
   doesn't exist in this file anymore

ref: NCSDK-13503

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This is a [nrf noup] because PSA_WANT_GENERATE_RANDOM is a Nordic
 configuration that is not found upstream. This was previously in
 commit 5cfe575 but has been split out

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This commit is a [nrf noup] because it removes configuration options
 for cryptographic algortihms available in Mbed TLS but which is not
 actively supported in nRF Connect SDK.
 The list of algorithms removed:
 - AES CFB - Cipher Feedback block cipher
 - AES OFB - Output Feedback block cipher
 - FFDH
 - RIPEMD160
 - Aria
 - Camellia
 - DES

 The removal of these algorithms is based both on a wish to remove
 weaker cryptography and unsupported features in the products we have
 today.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This is a [nrf noup] as this the upstream version of PSA crypto configs
 is generated by tooling, and there is no mechanisms to qualify
 that dependent configurations are enabled (by depends or select).
-This adds dependency-mapping between configurations in the Kconfigs
 added for PSA crypto in upstream.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This commit is a [nrf noup] because PSA crypto configs in upstream
 Zephyr doesn't have help-text in their configurations and we don't
 want to duplicate configurations to control the value
-This adds warning for SHA-1 and MD5 usage

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This is a [nrf noup] because the upstream Zephyr is generated using
 a script and is not committed as-is as source-code. The relevant
 responsible person for this feature has received information about
 the missing configuration and this will be resolved upstream in
 Mbed TLS and will propagate down to zephyr. Once this has happened,
 this [nrf noup] can be dropped.
-Add missing PSA_WANT_KEY_TYPE_RSA_KEY_DERIVE

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This commit contains all Nordic-specific configurations for PSA crypto
 These have been separated from Kconfig.psa, as this file is now
 auto-generated in the upstream project. This commit may be
 reworked later, in case more features are supported in Kconfig.psa
-Add Kconfig.psa.nordic containing Nordics PSA crypto addition
-Add reading this file from modules/mbedtls/Kconfig

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This commit is a [nrf noup] as Kconfig.psa is an auto-generated
 file. The changes reflected here has been reported to maintainers
 in upstream Zephyr.
 Change: Mbed TLS resolves PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC and
 PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT internally from the other
 types.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC is internally resolved by
 Mbed TLS. It has been made promptless in a previous commit.
 Keeping this change separated since the Kconfig.psa is auto-generated
 and it would likely be a bit more complex to handle this in a
 single commit. Upstream maintainers have been notified about this
 mismatch in configurations.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Doesn't sound like something that should be a [nrf noup], hence
 WIP

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Add board support for the nrf7002eb shield. This shield uses the
nordic edge-connector to be compatible with multiple boards.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>

Upstream PR: zephyrproject-rtos/zephyr#78330
Add build for nrf7002eb shield on thingy53 board.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>

Upstream PR: zephyrproject-rtos/zephyr#78330
Makes the boot banner function weak, this resolves an issue when
building with llext enabled which uses different build options
than a normal zephyr build

Signed-off-by: Jamie McCrae <[email protected]>
…ken from dt

Currently a user, or a shield definition, must select a Kconfig to
signal that the iovdd_ctrl and bucken GPIOs are connected to the same
pin. We can instead check this in the driver by simply checking if
the iovdd_ctrl_spec and bucken_spec are the same pin.

Update the nrfwifi driver and remove the redundant
NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO config.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>

Upstream PR: zephyrproject-rtos/zephyr#78485
In NCS to leverage HW acceleration, use nRF security.

Also, fix Kconfig warnings in NCS compliance for CRYPTO_ALT.

Signed-off-by: Chaitanya Tata <[email protected]>
External flash support is still WIP, so, to get sysbuild working add
dummy Kconfig options.

Signed-off-by: Chaitanya Tata <[email protected]>
fixup! [nrf noup] mbedtls: Add dependency logic for PSA crypto
configurations

-Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is
 enabled

(fixup of commit 47a1e03)

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Although ZVFS is experimental, the warning is annoying the matter team.
Therefore, remove the experimental selection.

This may be reverted once upstream unselects experimental.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
This should be removed once
zephyrproject-rtos/open-amp#21 is merged.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
External projects building the documentation may not clone all modules, as
they have manifest filtering. Therefore, not having access to a module
should not produce a fatal documentation build error. Convert the error to
a debug log, so it is at least traced.

Upstream PR: zephyrproject-rtos/zephyr#78876

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Bjarki Arge Andreasen <[email protected]>
-Enabling MBEDTLS_ECP_DP_SECP256R1_ENABLED curve type to ensure
 we don't get error-warnings about MBEDTLS_ECP_C dependencies not being
 met for WIFI samples.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.