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

(Auto-)Upmerge 20231010 #1347

Merged
merged 4,499 commits into from
Jan 10, 2024
Merged

(Auto-)Upmerge 20231010 #1347

merged 4,499 commits into from
Jan 10, 2024

Conversation

de-nordic
Copy link
Contributor

@de-nordic de-nordic commented Oct 10, 2023

Upmerging sdk-zephyr to: 23cf389

aescolar and others added 23 commits January 9, 2024 16:36
Reduce the sysbuild boilerplate required for
the nrf5340bsim targets.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 41f4826)
Signed-off-by: Dominik Ermel <[email protected]>
…ilerplate

Reduce the sysbuild boilerplate required for
the nrf5340bsim targets

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit b02fc27)
Signed-off-by: Dominik Ermel <[email protected]>
…lerplate

Reduce the sysbuild boilerplate required for
the nrf5340bsim targets

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit cbce338)
Signed-off-by: Dominik Ermel <[email protected]>
Reduce the sysbuild boilerplate required for
the nrf5340bsim targets

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit d2151aa)
Signed-off-by: Dominik Ermel <[email protected]>
Disables partition manager when building some samples and tests
which use sysbuild to prevent build issues

Signed-off-by: Jamie McCrae <[email protected]>
As the common.h is only meant to be used by the network
shell files, rename it to be more descriptive in order to
avoid possible conflicts with any other common.h file.

Signed-off-by: Jukka Rissanen <[email protected]>
(cherry picked from commit 477a4a5)
Adds a variable to Kconfig which, when set, will disable showing
child/parent Kconfig values in builds (enabled when Sysbuild is
used)

Signed-off-by: Jamie McCrae <[email protected]>
Add support for linking PIC shared object, which only require
linking, using their PLT and GOT lists and don't need any relocation
otherwise.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit d6a5a6e)
Export some symbols for loadable modules. Also add an
EXPORT_SYSCALL() helper macro for exporting system calls by their
official names.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit 69cdc32)
llext_seek(), llext_read() and llext_peek() are needed outside of the
extension code too, move them to a header.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit a2a62b4)
Add support for running a modular "Hello world" example on Xtensa.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit e5c8d18)
Use an element size explicitly when calculating the array size and
use the calculated size for memset().

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit b5ce501)
a new llext object is completely initialised with zeros after
allocation, no need to additionally set members of an embedded into
it array to NULL.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit b5506fe)
When using the LLEXT buffer loader we now avoid copying extensions
from storage to allocated memory by pointing directly into the stored
image. We then also perform linking and relocation in that memory,
which modifies its contents. However, this is impossible if that
storage is read-only. Add a Kconfig flag to distinguish between
writable and read-only storage types. Also use that flag to decide,
whether the extension image in test_llext_simple.c should be defined
as const or not.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
(cherry picked from commit dbea13a)
This is a follow-up to commit 7a83724.

There is no reason to mark that many GPIO lines as reserved on this
board. And doing so causes several existing tests to fail as they
are configured to use some of those now unavailable GPIO lines.

Limit reservation to the lines that actually cannot be used as
GPIOs without changes in the default configuration of the board
or its physical modification (via solder bridges), i.e.:
- XL1 and XL2 (connections for the 32.768 kHz crystal)
- NFC1 and NFC2 (NFC antenna connections)
- RESET
- TXD and RXD (lines used by the console UART)
- QSPI lines: CS, CLK, and DIO0-3

Provide names for all the GPIO lines that are described on the board.
Even for the reserved ones, so that it is clear why they are reserved.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit b172e51)
…rf.overlay

This is a follow-up to commit 7a83724.

This overlay uses an alternative connection (via spi2) for the external
flash present on the nRF52840 DK and it needs to use one of the QSPI
pins as GPIO, to get CS line control in the SPI communication. To make
it possible, that GPIO must be removed from those marked as reserved.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit 4a262c3)
…g external chips

Several scenarios in this test require specific external flash chips
to be connected to the nRF52840 DK. Specify proper fixture for them
so that they are not performed on the board without those required
external components connected.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit c949018)
…ata receiving

The incorrect semaphore was used for the ipc1 instance to synchronise
the data receiving.
This commit fixes it.

Signed-off-by: Marcin Jelinski <[email protected]>
(cherry picked from commit 7815e52fd15d49c47b4201470b0fe52dab3e3c9c)
Signed-off-by: Dominik Ermel <[email protected]>
This changes to pass full path of MAINTAINERS.yml to
get_maintainer.Maintainers(). Without this, Maintainers would
use git to find the top level of Zephyr tree. This restricts
building of doc only when the build directory is under Zephyr
root. Since we have ZEPHYR_BASE in gh_utils, we can pass full
path of MAINTAINERS.yml to Maintainers() so that doc build
directory no longer has to be under Zephyr root.

Fixes #65037

Signed-off-by: Daniel Leung <[email protected]>
(cherry picked from commit ede9b03)
Zephyr's domain code-sample object description was incorrectly yielded,
making Sphinx inventory (objects.inv) unusable on other projects that
need to use the domain via Intersphinx.

Ref. https://www.sphinx-doc.org/en/master/extdev/domainapi.html

Upstream PR: zephyrproject-rtos/zephyr#67384

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 139f7c8bb14f14a772ee0d9343bd06d727d9cca3)
So that external users of the domain only interested in e.g. referencing
roles, can skip such unneeded transformations.

Upstream PR: zephyrproject-rtos/zephyr#67384

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit bc7baa515ac10f07592777b76ca4dd8b3139dccc)
…er than UART

Test expects that there are no other backends enabled and some
may be enabled by default.

Signed-off-by: Krzysztof Chruściński <[email protected]>
(cherry picked from commit c143daf)
Signed-off-by: Dominik Ermel <[email protected]>
Add fixture to test suite to allow for and signal that the test
must be run on real hardware.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
(cherry picked from commit bec7789)
Signed-off-by: Dominik Ermel <[email protected]>
@nordicjm
Copy link
Contributor

Copy link
Contributor

@cvinayak cvinayak left a comment

Choose a reason for hiding this comment

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

approve subsys/bluetooth/controller tree upmerge.

Copy link

@shanthanordic shanthanordic left a comment

Choose a reason for hiding this comment

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

Based on intergration test results I am giving +1

@de-nordic de-nordic merged commit 883c370 into nrfconnect:main Jan 10, 2024
54 of 57 checks passed
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.