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

Adopting nRF SoC and boards to HWMv2 #66648

Merged
merged 105 commits into from
Feb 14, 2024
Merged

Adopting nRF SoC and boards to HWMv2 #66648

merged 105 commits into from
Feb 14, 2024

Conversation

tejlmand
Copy link
Collaborator

Followup on #50305 with porting of Nordic's nRF SoCs and boards.

@tejlmand tejlmand requested a review from carlescufi as a code owner December 19, 2023 10:56
@tejlmand tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch 4 times, most recently from 619ae19 to 5f87b4f Compare December 20, 2023 12:22
@tejlmand tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch 2 times, most recently from f5007bc to 3df5cfe Compare December 20, 2023 19:27
rerickson1
rerickson1 reviewed Dec 21, 2023
View reviewed changes
Copy link
Member

@rerickson1 rerickson1 left a comment

Choose a reason for hiding this comment

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

Laird Connectivity boards look good.

I noticed rm1xx_dvk is missing from being moved to v2. It is based on SOC_NRF51822_QFAC

@tejlmand tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch 2 times, most recently from 2b6fb63 to ed31c97 Compare January 5, 2024 13:11
@tejlmand
Copy link
Collaborator Author

tejlmand commented Jan 5, 2024

compliance and doc build failures are related to MAINTAINERS.yml file.

This file will be independently updated when socs and boards have been ported.

Compliance and doc build errors

get_maintainer.MaintainersError: MAINTAINERS.yml: glob pattern 'boards/arm/bl65*/' in 'files' in area 'Laird Connectivity platforms' does not match any files

@tejlmand tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch from ed31c97 to 8487e7f Compare January 8, 2024 09:12
@tejlmand tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch from 8487e7f to 8034bac Compare January 9, 2024 11:14
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from 8034bac to e6ff528 Compare January 9, 2024 12:28
@tejlmand tejlmand mentioned this pull request Jan 10, 2024
Closed
11 tasks
@tejlmand tejlmand mentioned this pull request Jan 16, 2024
Closed
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch 5 times, most recently from 361a5c6 to cb6a26c Compare January 22, 2024 11:08
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from f269b72 to 5f0f736 Compare January 23, 2024 14:08
@nordicjm
boards: arm: nrf9160_innblue22: Convert to v2
11ed5ba 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: thingy53_nrf5340: Convert to v2
db251c3 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf5340_audio_dk_nrf5340: Convert to v2
1cfbfe3 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: raytac_mdbt53_db_40: Convert to v2
f3ab5f7 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: raytac_mdbt53v_db_40_nrf5340: Convert to v2
ff08480 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: bl5340_dvk: Convert to v2
e18d884 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf9131ek_nrf9131: Convert to v2
3bf2e39 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf9161dk_nrf9161: Convert to v2
736d73c 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: 96b_carbon_nrf51: Convert to v2
60cfa0f 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
manifest: Update MCUboot
722eda1 
Updates MCUboot to bring in updated hwmv2 board names

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
soc: nordic_nrf: Migrate nRF9151 to v2
20dcac4 
Moves this SoC over from v1 to v2 so it can be used in HWMv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf9151dk_nrf9151: Convert to v2
0d00e7b 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
soc: nordic_nrf: Migrate nRF54H/nRF54L to v2 and fix nrf
e1f6968 
Moves this SoC over from v1 to v2 so it can be used in HWMv2, and
fix the SoC configuration for existing nordic_nrf devices which
was not ported properly

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf54h20pdk_nrf54h20: Convert to v2
33b8e00 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: arm: nrf54l15pdk_nrf54l15: Convert to v2
742bd1e 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
treewide: Update board names for hwmv2
9f88f33 
Updates tests that use board names which have changed with boards v2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from 2190bca to 1106740 Compare February 14, 2024 14:05
@nordicjm
cmake: modules: configuration_files: Add board identifier overlay file
8a17c83 
Fixes an issue in hwmv2 whereby an overlay file exists with the full
board name and identifier which worked in hwmv1

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm
boards: posix: nrf_bsim: Update paths
09449a5 
Updates paths for the moved nordic_nrf SoC folder

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from 1106740 to 2c91418 Compare February 14, 2024 14:08
@nordicjm
boards: arm: pan1783: Convert to v2
cf5b302 
Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from 2c91418 to cf5b302 Compare February 14, 2024 14:13
@nordicjm nordicjm merged commit a852186 into zephyrproject-rtos:collab-hwm Feb 14, 2024
25 of 29 checks passed
tejlmand added a commit to tejlmand/zephyr that referenced this pull request Feb 15, 2024
@tejlmand
soc: set linker script for ra4m1
ecd8f61 
Follow-up: zephyrproject-rtos#66648

Commit 595b06a accidentally removed
linker.ld for the ra4m1 SoC.

As the linker.ld anyway included the common arm cortex_m linker script
then fix this by setting a correct SOC_LINKER_SCRIPT value.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
@tejlmand tejlmand mentioned this pull request Feb 15, 2024
Merged
nashif pushed a commit that referenced this pull request Feb 15, 2024
@tejlmand @nashif
soc: set linker script for ra4m1
307ea9b 
Follow-up: #66648

Commit 595b06a accidentally removed
linker.ld for the ra4m1 SoC.

As the linker.ld anyway included the common arm cortex_m linker script
then fix this by setting a correct SOC_LINKER_SCRIPT value.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
nordicjm pushed a commit that referenced this pull request Feb 23, 2024
@tejlmand @nordicjm
soc: set linker script for ra4m1
77b48ff 
Follow-up: #66648

Commit 595b06a accidentally removed
linker.ld for the ra4m1 SoC.

As the linker.ld anyway included the common arm cortex_m linker script
then fix this by setting a correct SOC_LINKER_SCRIPT value.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
nordicjm pushed a commit that referenced this pull request Mar 1, 2024
@tejlmand @nordicjm
soc: set linker script for ra4m1
f1093ed 
Follow-up: #66648

Commit 595b06a accidentally removed
linker.ld for the ra4m1 SoC.

As the linker.ld anyway included the common arm cortex_m linker script
then fix this by setting a correct SOC_LINKER_SCRIPT value.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
carlescufi pushed a commit that referenced this pull request Mar 1, 2024
@tejlmand @carlescufi
soc: set linker script for ra4m1
d517d3c 
Follow-up: #66648

Commit 595b06a accidentally removed
linker.ld for the ra4m1 SoC.

As the linker.ld anyway included the common arm cortex_m linker script
then fix this by setting a correct SOC_LINKER_SCRIPT value.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordicjm nordicjm nordicjm approved these changes

@gmarull gmarull gmarull approved these changes

@carlescufi carlescufi carlescufi approved these changes

@Navin-Sankar Navin-Sankar Awaiting requested review from Navin-Sankar

@greg-leach greg-leach Awaiting requested review from greg-leach

@LingaoM LingaoM Awaiting requested review from LingaoM

@ioannisg ioannisg Awaiting requested review from ioannisg

@stephanosio stephanosio Awaiting requested review from stephanosio

@nandojve nandojve Awaiting requested review from nandojve

@kartben kartben Awaiting requested review from kartben

@carlocaione carlocaione Awaiting requested review from carlocaione

@povergoing povergoing Awaiting requested review from povergoing

@lorc lorc Awaiting requested review from lorc

@firscity firscity Awaiting requested review from firscity

@sidcha sidcha Awaiting requested review from sidcha

@erwango erwango Awaiting requested review from erwango

@ABOSTM ABOSTM Awaiting requested review from ABOSTM

@FRASTM FRASTM Awaiting requested review from FRASTM

@avisconti avisconti Awaiting requested review from avisconti

@yonsch yonsch Awaiting requested review from yonsch

@fkokosinski fkokosinski Awaiting requested review from fkokosinski

@kgugala kgugala Awaiting requested review from kgugala

@ibirnbaum ibirnbaum Awaiting requested review from ibirnbaum

@MulinChao MulinChao Awaiting requested review from MulinChao

@ChiHuaL ChiHuaL Awaiting requested review from ChiHuaL

@Mani-Sadhasivam Mani-Sadhasivam Awaiting requested review from Mani-Sadhasivam

@mmahadevan108 mmahadevan108 Awaiting requested review from mmahadevan108

@dleach02 dleach02 Awaiting requested review from dleach02

@simonguinot simonguinot Awaiting requested review from simonguinot

@parthitce parthitce Awaiting requested review from parthitce

@jackrosenthal jackrosenthal Awaiting requested review from jackrosenthal

@ifyall ifyall Awaiting requested review from ifyall

@npal-cy npal-cy Awaiting requested review from npal-cy

@vanti vanti Awaiting requested review from vanti

@soburi soburi Awaiting requested review from soburi

@rerickson1 rerickson1 Awaiting requested review from rerickson1

Assignees
No one assigned
Labels
DNM This PR should not be merged (Do Not Merge) manifest manifest-mcuboot
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tejlmand @nordicjm @zephyrbot @kartben @rerickson1 @carlescufi @gmarull