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

applications: nrf_desktop: Align static PM config for nRF54L15 PDK #23

Closed

Conversation

MarekPieta
Copy link

Change aligns static Partition Manager configuration after FLPR core support was added to Zephyr. RRAM allocated for FLPR core is not used by application core.

Jira: NCSDK-27508

rlubos and others added 14 commits May 20, 2024 16:49
Pull upmerged sdk-zephyr and sdk-mcuboot repositories.
Pull fixes in matter and find-my.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
PORTING.md is now referenced by other docs, hence make sure it's visible
during doc build.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Specifically NET_L2_BT and NET_L2_BT_SHELL.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
d590bcb removed the
CONFIG_BT_HCI_RAW_RESERVE Kconfig option. Align NCS to the change.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
A new calblack event (ZPERF_SESSION_PERIODIC_RESULT) has been added to
zperf, just ignore it int the sample for now to prevent build warnings.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
lwm2m_engine_set_data_cb_t callback signaure now has an additional
offset parameter.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
NCS boot banner has to be standalone entity from Zephyr boot banner.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG symbol has been added as an choice
option in upstream Zephyr, which is not compatible with how nrf_security
interprets the symbol. Try to fix this on the nrf_security side.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
From the upstream migration guide:

The SMF_CREATE_STATE macro now always takes 5 arguments. The amount
of arguments is now independent of the values of
CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION.
If the additional arguments are not used, they have to be set to NULL

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Align code after 484fe3f was added to
Zephyr.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
18c23da removes CONFIG_BT_HCI_VS_EXT.
Align BLE controller configuration with the changes.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Enabling custom fatal error handler globally can be problematic for
sdk-zephyr samples built in NCS context, as they may define their own
handlers, causing linker error. As there's no elegant way to handle that
on the sample side, other than noup patches in sdk-zephyr, disable the
RESET_ON_FATAL_ERROR config by default.

As an alternative for NCS, the config will now be implied by
NCS_SAMPLES_DEFAULTS config, which is exclusive for NCS samples only.

Additionally, enable CONFIG_REBOOT in a few samples, which rely on
reboot functionality but did not enable config explicitly.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
nRF Desktop application does not use boot banners provided by Zephyr
and NCS.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Having mbed TLS enabled in the system does not automatically mean it's
used for HTTPS communication in memfault. If offloaded sockets are used,
it's not the case regardless of mbed TLS configurations.

Override the default value for MEMFAULT_HTTP_USES_MBEDTLS config in case
NRF_MODEM_LIB is enabled to n. This config simply enables some extra
checks for mbed TLS configuration (whether it fits memfault needs), but
since it's not really used for offloaded sockets, it can generate
false errors. By default, the config is set to y whenever mbed TLS is
enabled, which is oversimplified condition for our case.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
Change aligns RRAM configuration for nRF54L15 PDK. The application does
not use cpuflpr core, so whole memory can be used by cpuapp.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@MarekPieta MarekPieta force-pushed the nrf54l_desktop_fix branch from 311dc90 to c083d30 Compare May 21, 2024 09:14
@MarekPieta MarekPieta requested review from mkapala-nordic and zycz May 21, 2024 09:14
@rlubos rlubos force-pushed the upmerge-16-05-2024 branch from 3b083d3 to 325690f Compare May 21, 2024 09:19
@rlubos rlubos force-pushed the upmerge-16-05-2024 branch from 325690f to cb6c553 Compare May 21, 2024 10:10
Copy link

@magp-nordic magp-nordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing size of RRAM available to APP core looks good to me. One note: if you want to change size of code partition for APP core application, then you also need to change size of slot0_partition.

@MarekPieta
Copy link
Author

Changing size of RRAM available to APP core looks good to me. One note: if you want to change size of code partition for APP core application, then you also need to change size of slot0_partition.

Our application uses Partition Manager. Because of that slot0_partition is actually ignored (I desisted from updating it to avoid misleading readers)

@rlubos rlubos force-pushed the upmerge-16-05-2024 branch from cb6c553 to 2b0bdf1 Compare May 21, 2024 13:34
@rlubos
Copy link
Owner

rlubos commented May 21, 2024

Cherry-picked into the upmerge branch

@rlubos rlubos closed this May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants