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

[nrf noup] boards: add nrf54l15/nrf54l15/cpuapp/ns as board variant #13

Open
wants to merge 152 commits into
base: meta-upmerge
Choose a base branch
from

Conversation

tejlmand
Copy link

@tejlmand tejlmand commented Oct 4, 2024

fixup! [nrf noup] boards: add nrf54l15/nrf54l15/cpuapp/ns as board variant

tejlmand and others added 30 commits October 4, 2024 10:49
This commit adds the nRF54l15//nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15pdk with TF-M in nRF Connect SDK.

This is done as a nrf noup patch as the out-of-tree board extension
feature is not available. When zephyrproject-rtos/zephyr#69548 is
completed, then this commit can be reverted and the variant be placed in
sdk-nrf repository.

The nRF54L15 is using the SAU and the MPC to configure the security
attributes for TrustZone. The SPU is only used for the configuration
of the peripherals. This sets the Kconfig configurations for TrustZone
which use the correct region size(based on the MPC) for nRF54L15.

Ref: NCSDK-25023

Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Georgios Vasilakis <[email protected]>
Zephyr's boot banner should not be used if NCS boot banner is enabled.

Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 67b7cca)
Complete rewrite of the 54l_ns DT board definition.

Now the secure board and non-secure board re-use a lot more code,
giving us a more maintainable solution.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 5e11b5f)
…eferences"

This reverts commit b876bd2.

That needs mbed TLS 3.6.0 to work, as pk_ecc.c was added in that
version.

To be reverted, when mbed TLS is updated to 3.6.0 in NCS.

Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 590a64a)
Removes explicit support for the legacy advertiser due
to incompatibility with SDC.

The legacy advertiser can be used (experimentally) with the
Zephyr Link Layer enabled, but is not recommended.

Signed-off-by: Håvard Reierstad <[email protected]>
(cherry picked from commit 60fce5e)
Disable processing of extended ADV packets by mesh scanner.
This is done to prevent loss of scan time due to reception
of pointer packets while scanning for mesh packets.

Signed-off-by: Ingar Kulbrandstad <[email protected]>
(cherry picked from commit 18285a0)
Changes the default MCUboot mode to update only for the thingy53,
to align with previous bootloader builds

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 48cb4e7)
Align to changes in DTS:
  renamed: rram0 -> cpuapp_rram
  sized up cpauapp_rram region szie as part of it was reserved for
  cpuflpr_rram (which is not used by this config).

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit c3898cc)
This will be replaced by a different solution upstream (NCSDK-27673).

Migrate the existing BICR bindings from NCS 2.4.99-cs3 to NCS 2.7.0.
They are updated to remove obsoleted values. Enable generating bicr.hex
for Application core by default.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit eb8e8ef)
Adjustment LFXO CLOAD value. New value is a resualt of DK's characterization.

Signed-off-by: Karol Lisak <[email protected]>
(cherry picked from commit fa10fde)
PM support is still required for nRF53/nRF54l15 in the context of NCS.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Introduce NVS_LOOKUP_CACHE_FOR_SETTINGS Kconfig option that
enables a dedicated hash function for the NVS lookup cache
that takes advantage of the NVS ID allocation scheme used
by the NVS settings backend. As such, this option should
only be used if an application uses NVS via the settings
layer.

Signed-off-by: Damian Krolik <[email protected]>
(cherry picked from commit 3198700)
This adds temporary entropy driver simulation for
nRF54h20 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Jira: NCSDK-25947

Signed-off-by: Kamil Gawor <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit c80ee99)
Turn off suspending MRAM for NRF54H20 DK
This change is required so sections of code
depending on critical timings will not have unacceptable latency.

Turn on NRFS globally so turning off
suspending MRAM for NRF54H20 DK will work.

Signed-off-by: Jan Zyczkowski <[email protected]>
(cherry picked from commit 58284ff)
(cherry picked from commit 9b6cae8)
(cherry picked from commit 2c2f60d)
fixup! [nrf noup] soc: arm: nRF91: Add SPU Flash/RAM alignment

The nRF54L15 doesn't use the SPU for setting the security attributes
for flash/RAM regions. In order to avoid having multiple Kconfigs
with similar meaning I renamed the alignment Kconfig option to something
more generic in order to use the same symbol for all the TrustZone enabled
devices.

Ref: NCSDK-25023

Signed-off-by: Georgios Vasilakis <[email protected]>
squash! [nrf noup] board: nordic: thingy53: Default to update only MCUboot type

Changes the thingy53 default configuration for sysbuild to enable
using all RAM in the MCUboot image

Signed-off-by: Jamie McCrae <[email protected]>
Should be executed only when bluetooth is changing.

Signed-off-by: Piotr Kosycarz <[email protected]>
Folder renamed at HWMv2:
soc/arm/nordic_nrf->soc/nordic

Signed-off-by: Piotr Kosycarz <[email protected]>
Renamed:
samples/bluetooth/hci_rpc->samples/bluetooth/hci_ipc

Signed-off-by: Piotr Kosycarz <[email protected]>
Update dependent sources.

Signed-off-by: Piotr Kosycarz <[email protected]>
No longer used.

Signed-off-by: Piotr Kosycarz <[email protected]>
Update dependent sources.

Signed-off-by: Piotr Kosycarz <[email protected]>
Still trigger on all code changes but excluded non-code folders.

Signed-off-by: Piotr Kosycarz <[email protected]>
Base on compilation dependencies.

Signed-off-by: Piotr Kosycarz <[email protected]>
Do not permit configuring clocks from non-secure as NRF_OSCILLATORS is
a not supported as a non-secure peripheral

Signed-off-by: Sebastian Bøe <[email protected]>
In this patch we do several things to be able to configure power and
clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure.

We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance.

We also ifdef-out the configuration when nordicsemi_nrf54l_init is
invoked from a non-secure image, because the peripherals are secure.

Signed-off-by: Sebastian Bøe <[email protected]>
This action will automatically manage a PR to sdk-nrf
once a PR to sdk-zephyr is created.

This includes:
 - Creating an initial PR
 - Updating and (optionally) rebase it once the PR
   to sdk-nrf is merged.

The action can be disabled by adding the string
"manifest-pr-skip" to the title or body of the PR.

This will simplify cherry-picking changes from upstream
zephyr.

Signed-off-by: Rubin Gerritsen <[email protected]>
Upstream PR: zephyrproject-rtos/zephyr#72857

Cleanup the Kconfig generating code in hwm_v2.cmake by moving common
logic inside the kconfig_gen() helper function.

This prepares the code for board extension feature.

Signed-off-by: Torsten Rasmussen <[email protected]>
(cherry picked from commit d39cc46b56294b6eb297a67478334c23db8c8ca3)
This automated patch is inserted before a cherry-pick of:

ad16407 cmake: scripts: support board extension

This allows the above commit to be applied cleanly, even though it
appears to conflict with the following commit(s):

ec3b301 [nrf fromlist] scripts: support soc/boards in Zephyr modules

The conflicts are left to be fixed in a follow-up patch, instead of
doing so in the cherry-pick itself.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Upstream PR: zephyrproject-rtos/zephyr#72857

Fixes: #69548

Support extending an existing board with new board variants.

This commit introduces the following changes to allow a board to be
extended out-of-tree.

The board yaml schema is extended to support an extend field which
will be used to identify the board to be extended.

A board 'plank' can be extended like this:
> board:
>   extend: plank
>   variants:
>     - name: ext
>       qualifier: soc1

For the rest of the build system this means that there is no longer a
single board directory.
The existing CMake variable BOARD_DIR is kept and reference the
directory which defines the board.
A new CMake variable BOARD_DIRECTORIES provides a list of all
directories which defines board targets for the board.
This means the directory which defines the board as well as all
directories that extends the board.

Signed-off-by: Torsten Rasmussen <[email protected]>
(cherry picked from commit ad16407aca8ccde1aaa57d4d1dcb15bb4d0bfc25)
tmon-nordic and others added 29 commits October 4, 2024 11:40
Use the quirk to keep only the necessary clocks running when the core is
hibernated. The quirk is necessary to bring the USB suspend current
below the USB 2.0 suspend current limit.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit e2f2e44)
OCT-3045
This fix is related to nrfconnect#2006
this adds the bt-ll-sw-split snippet for more bluetooth samples

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
Adds a depends on that requires the underlying driver support
explicit erase

Upstream PR: zephyrproject-rtos/zephyr#79090

Signed-off-by: Jamie McCrae <[email protected]>
Adds missing SPI definition and settings for usage of FEM on
this platform

Upstream PR: zephyrproject-rtos/zephyr#78657

Signed-off-by: Jamie McCrae <[email protected]>
Allows forwarding GPIO pins to network core automatically if the
devicetree node exists.

Upstream PR: zephyrproject-rtos/zephyr#78657

Signed-off-by: Jamie McCrae <[email protected]>
…config

Removes forcing the Kconfig to be enabled as this is now determined
automatically

Upstream PR: zephyrproject-rtos/zephyr#78657

Signed-off-by: Jamie McCrae <[email protected]>
…on-flash mem

Added support for devices don't require explicit pager erase.
For these device flattening of mcuboot image status is relevant.

Upstream PR: zephyrproject-rtos/zephyr#79152

Signed-off-by: Andrzej Puzdrowski <[email protected]>
The http_client_req() function's timeout parameter is allowed
to be SYS_FOREVER_MS. However, K_MSEC() does not convert this
to a proper k_timeout_t, so sys_timepoint_calc() ends up
returning 0, which is causes immediate timeouts.

Check for this case specifically and force value passed to
sys_timepoint_calc() to be correct.

(cherry picked from commit 09fab7e)

Signed-off-by: Pete Skeggs <[email protected]>
Not all offloaded network stacks support this socket option.

Go back to previous behavior that it is not used, but allow it
to be enabled using CONFIG_COAP_CLIENT_TRUNCATE_MSGS.

Signed-off-by: Pete Skeggs <[email protected]>
Fix the following compilation warning given when using newlibc:
warning: 'response_truncated' may be used
uninitialized [-Wmaybe-uninitialized]

Issue is not seen with picolibc.

The variable was introduced as part of PR #76257

Upstream PR: zephyrproject-rtos/zephyr#79186

Signed-off-by: Tommi Rantanen <[email protected]>
… default

The external flash (mx25r64) was accidentally disabled during
testing. The node should be enabled by default like its spi.

This commit removes the status = "disabled";

Upstream PR: zephyrproject-rtos/zephyr#79191

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
In case WPA supplicant disabled DPP, we need to compile out the
corresponding DPP code in Wi-Fi shell too.

Upstream PR: zephyrproject-rtos/zephyr#79224

Signed-off-by: Chaitanya Tata <[email protected]>
When an event is sent the receiver gets is asynchronously and hence is
responsible for free the event, the sender should only free in case of
error conditions i.e., unable to send.

Else, this causes a tough to debug double-free.

Upstream PR: zephyrproject-rtos/zephyr#79231

Signed-off-by: Chaitanya Tata <[email protected]>
…itions

In case of error conditions post successfully sending the message, the
event is already freed but we attempt to free it again.

Rejig the labels to easily reflect thier purpose.

Upstream PR: zephyrproject-rtos/zephyr#79231

Signed-off-by: Chaitanya Tata <[email protected]>
The module name is not modified in remove.

Upstream PR: zephyrproject-rtos/zephyr#79231

Signed-off-by: Chaitanya Tata <[email protected]>
Using a separate workqueue causes issues without any special locking to
synchronize with networking threads e.g., interface being removed while
the workqueue is trying to synchronize with WPA supplicant.

It's easier to use the net_mgmt thread which is in better sync with
networking.

Upstream PR: zephyrproject-rtos/zephyr#79231

Signed-off-by: Chaitanya Tata <[email protected]>
Since UDC buffers are allocated with `UDC_BUF_GRANULARITY` granularity,
the `net_buf_tailroom` may no longer be equal to the HID report size.
Use `setup->wLength` instead to ensure that proper HID report size is
passed to the application's callback.

(cherry picked from commit 88231b5)

Signed-off-by: Marek Pieta <[email protected]>
fixup! [nrf noup] samples/tests: Disable PM for some sysbuild builds

Disables partition manager when building some samples and tests
which use sysbuild to prevent build issues

Signed-off-by: Jamie McCrae <[email protected]>
…y code

Pull in changes to pass country code as string to firmware.

Upstream PR: zephyrproject-rtos/zephyr#79262

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
* Wait for update when new object is created

  Sometimes our blockwise transfer starts before server have
  received an LwM2M Update. This causes Leshan to reject the SEND
  because is was not aware of object /19/0

* Wait "registered" message already in conftest.py.
  Sometimes Qemu boots faster, and the testcase don't see the
  log.

Upstream PR: zephyrproject-rtos/zephyr#79261

Signed-off-by: Seppo Takalo <[email protected]>
This board just don't have enough RAM for all tests
so it is just a maintenance headache without any
benefits.

Upstream PR: zephyrproject-rtos/zephyr#79261

Signed-off-by: Seppo Takalo <[email protected]>
The dispatcher table needs to be large enough to have support
for all file descriptor values.

Fixes #79042

(cherry picked from commit 077dd8f)

Signed-off-by: Jukka Rissanen <[email protected]>
Add CHECKIF() checks that verify that dispatcher table is
not overflowing.

(cherry picked from commit 2ff2667)

Signed-off-by: Jukka Rissanen <[email protected]>
…tors

Make sure that CONFIG_ZVFS_OPEN_MAX in the tests and samples is at
least the same value as CONFIG_NET_SOCKETS_POLL_MAX so that we
cannot have more polled sockets than there are available file
descriptors.

(cherry picked from commit 759f3a0)

Signed-off-by: Jukka Rissanen <[email protected]>
mbed TLS MD operations, used by IPv6 Privacy Extensions, require access
to heap. This may vary depending on platform/mbed TLS variant used,
hence enable CONFIG_MBEDTLS_ENABLE_HEAP in tests to ensure mbed TLS has
always access to some heap memory.

Upstream PR: zephyrproject-rtos/zephyr#79303

Signed-off-by: Robert Lubos <[email protected]>
This manifest update points open-amp to include a fix for unsafe use
of strncpy by by replacing it with internal strlcpy.

Upstream PR: zephyrproject-rtos/zephyr#79212

Signed-off-by: Torsten Rasmussen <[email protected]>
…rialized 802.15.4

Currently, the serialization module for 802.15.4 enabled
the network core without giving it access to application
core memory in trusted execution mode. This commit
grands this access.

Upstream PR: zephyrproject-rtos/zephyr#79316

Signed-off-by: Dominik Kilian <[email protected]>
fixup! [nrf noup] boards: add nrf54l15/nrf54l15/cpuapp/ns as board variant

Signed-off-by: Torsten Rasmussen <[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.