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.

Sign up for GitHub

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

Jump to bottom

Upmerge 25-03-2024 #1279

Merged
merged 10 commits into from
Apr 30, 2024
Merged

Upmerge 25-03-2024 #1279

merged 10 commits into from
Apr 30, 2024

Conversation

jciupis
Copy link

@jciupis jciupis commented Apr 3, 2024 •
edited
Loading

HWMv2 brings updated SoC names. This commit aligns the libraries directories names to match them.

@NordicBuilder NordicBuilder mentioned this pull request Apr 3, 2024
Closed
@jciupis jciupis requested a review from a team as a code owner April 4, 2024 06:59
@ankuns
Copy link
Contributor

ankuns commented Apr 4, 2024

@jciupis , conflicts, recent deploy or RD changed the content of SL, so so you need to rework commit named nrf_802154: rename libraries to match updated SoC names

@NordicBuilder NordicBuilder mentioned this pull request Apr 4, 2024
Merged
@jciupis
Copy link
Author

jciupis commented Apr 4, 2024

Cherry-picked 38b019c from #1278 to address nrfconnect/sdk-nrf#14626 (comment)

@jciupis jciupis changed the title nrf_802154: rename libraries to match updated SoC names Upmerge 25-03-2024 Apr 4, 2024
anhmolt
anhmolt approved these changes Apr 4, 2024
View reviewed changes
Copy link
Contributor

@anhmolt anhmolt left a comment

Choose a reason for hiding this comment

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

Changes to nrf_modem LGTM.

@magnev
Copy link
Contributor

magnev commented Apr 5, 2024

Gazell libs are not found in compilation since they are using outdated SoC names: nRF52840 instead of nrf52840

@jciupis
Copy link
Author

jciupis commented Apr 5, 2024

@magnev yes, it's a common problem for (probably) all the libraries in nrfxlib. Feel free to push changes required for the libraries you own to this PR or let me know what needs to be cherry-picked.

@jciupis jciupis requested a review from leewkb4567 as a code owner April 5, 2024 09:04
MirkoCovizzi
MirkoCovizzi approved these changes Apr 10, 2024
View reviewed changes
Copy link
Contributor

@MirkoCovizzi MirkoCovizzi left a comment

Choose a reason for hiding this comment

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

Approved wrt nrf_modem part.

leewkb4567
leewkb4567 approved these changes Apr 10, 2024
View reviewed changes
Copy link
Contributor

@leewkb4567 leewkb4567 left a comment

Choose a reason for hiding this comment

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

The Gazell samples work on nRF52 DK, nRF52833 DK, nRF52840 DK, and nRF5340 DK.

@CLAassistant
Copy link

CLAassistant commented Apr 17, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jciupis
Copy link
Author

jciupis commented Apr 17, 2024

@gWacey please sign the CLA for all checks to pass

@jciupis jciupis force-pushed the pr/upmerge-25032024 branch 2 times, most recently from 04c4846 to 54e1bbe Compare April 23, 2024 08:36
@jciupis jciupis mentioned this pull request Apr 23, 2024
Merged
@Tschet1
Copy link
Contributor

Tschet1 commented Apr 26, 2024

approved nrf_dm part.
The nrf_dm sample is broken, but it seems it is also broken on main.

@hermabe
Copy link
Member

hermabe commented Apr 26, 2024

Please rebase on main and drop the commits moving the mpsl and softdevice controller libraries. We no longer use the value of CONFIG_SOC to determine the library paths, so there is no need to move the libraries.

Jędrzej Ciupis and others added 10 commits April 26, 2024 13:02
nrf_802154: rename libraries to match updated SoC names
29d3e0b 
HWMv2 brings updated SoC names. This commit aligns the nRF 802.15.4 SL
libraries directories names to match them.

Signed-off-by: Jędrzej Ciupis <[email protected]>
@MirkoCovizzi
nrf_modem: update binary linking to support HWMv2
1bef380 
This commit updates the cmake configuration file to
recognize the new SOC names defined with HWMv2.

Signed-off-by: Mirko Covizzi <[email protected]>
nrf_802154: only select ZERO_LATENCY_IRQS for HW targets
2e9fe14 
The option is only supported on ARM architectures and causes Kconfig
build errors when selected for POSIX architecture. Do not select it when
building for simulated targets.

Signed-off-by: Jędrzej Ciupis <[email protected]>
@magnev
gzll: rename library paths to match updated SoC names
50db883 
HWMv2 brings updated SoC names. This commit aligns the Gazell library
directories names to match them.

Signed-off-by: Magne Værnes <[email protected]>
@gWacey
LC3: Rename LC3 library directory to match updated SoC names
c7541af 
HWMv2 brings updated SoC names. This commit aligns the LC3 library
directories names to match them.

Signed-off-by: Graham Wacey <[email protected]>
@piotrkoziar
nrf802154: rename nRF54H20_CPURAD libraries to nrf54h20
ec3f36a 
Aligns the nRF 802.15.4 SL directory name for nRF54H20 to the one
introduced by HWMv2.

Signed-off-by: Piotr Koziar <[email protected]>
@piotrkoziar
nrf_802154: remove nRF52H20 libraries for SOC1
92eaa6b 
Removes nRF 802.15.4 SL libraries for unsupported nRF54H20 SOC1.

Signed-off-by: Piotr Koziar <[email protected]>
@nordicjm
cmake: Add CPU cluster to SoCs that need it
a21e747 
Adds the CPU cluster to boards that need this information where
there are multiple of them

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
nrf_dm: Rename files
30dfe92 
Renames files to use the updated HWMv2 names

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
!fixup libs: Rename libraries properly
f5a8f7f 
Adds the CPU cluster to libraries for the nRF5340

Signed-off-by: Jamie McCrae <[email protected]>
@jciupis
Copy link
Author

jciupis commented Apr 26, 2024

@hermabe please check if the current contents of this PR meet your requirements.

@hermabe
Copy link
Member

hermabe commented Apr 26, 2024

@hermabe please check if the current contents of this PR meet your requirements.

Looks correct to me. No changes to mpsl and softdevice controller library paths should be needed for the upmerge since we have separate configs now. I am able to build a sample on the sdk-nrf upmerge branch.

@gmarull gmarull merged commit a0cf45f into nrfconnect:main Apr 30, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anhmolt anhmolt anhmolt approved these changes

@ankuns ankuns ankuns approved these changes

@leewkb4567 leewkb4567 leewkb4567 approved these changes

@Tschet1 Tschet1 Tschet1 approved these changes

@MirkoCovizzi MirkoCovizzi MirkoCovizzi approved these changes

@ahasztag ahasztag Awaiting requested review from ahasztag

@rlubos rlubos Awaiting requested review from rlubos rlubos is a code owner

@lemrey lemrey Awaiting requested review from lemrey lemrey is a code owner

@eivindj-nordic eivindj-nordic Awaiting requested review from eivindj-nordic

@koffes koffes Awaiting requested review from koffes koffes is a code owner

@alexsven alexsven Awaiting requested review from alexsven alexsven is a code owner

@eriksandgren eriksandgren Awaiting requested review from eriksandgren eriksandgren is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.