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

Introduce nRF7120 SoC and board definitions to sdk-nrf #20070

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

rob-robinson-14
Copy link

PR containing out of tree definitions for nrf7120.

@rob-robinson-14 rob-robinson-14 requested review from a team as code owners January 24, 2025 12:44
@CLAassistant
Copy link

CLAassistant commented Jan 24, 2025

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Jan 24, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 24, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 8

Inputs:

Sources:

sdk-nrf: PR head: f73fc0b2162cc2b7bacea2e9af4e8d9ac3b7a3ee

more details

sdk-nrf:

PR head: f73fc0b2162cc2b7bacea2e9af4e8d9ac3b7a3ee
merge base: 085e5a678ca84a3b5c8cd2e0c3b41de872f4b9cf
target head (main): ab1330a0fb2d36f98d3365180df2d339ee503a93
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (38)
boards
│  ├── nordic
│  │  ├── nrf7120pdk
│  │  │  ├── Kconfig
│  │  │  ├── Kconfig.defconfig
│  │  │  ├── Kconfig.nrf7120pdk
│  │  │  ├── board.cmake
│  │  │  ├── board.yml
│  │  │  ├── nrf7120_enga_cpuapp_common.dtsi
│  │  │  ├── nrf7120pdk_nrf7120_enga-common.dtsi
│  │  │  ├── nrf7120pdk_nrf7120_enga-pinctrl.dtsi
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp.dts
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp.yaml
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp_ns.dts
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp_ns.yaml
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuapp_ns_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuflpr.dts
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuflpr.yaml
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuflpr_defconfig
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuflpr_xip.dts
│  │  │  ├── nrf7120pdk_nrf7120_enga_cpuflpr_xip.yaml
│  │  │  │ nrf7120pdk_nrf7120_enga_cpuflpr_xip_defconfig
dts
│  ├── arm
│  │  ├── nordic
│  │  │  ├── nrf7120_enga.dtsi
│  │  │  │ nrf7120_enga_cpuapp.dtsi
│  ├── riscv
│  │  ├── nordic
│  │  │  │ nrf7120_enga_cpuflpr.dtsi
soc
│  ├── nordic
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  ├── Kconfig.soc
│  │  ├── nrf71
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── Kconfig.defconfig
│  │  │  ├── Kconfig.defconfig.nrf7120_enga_cpuapp
│  │  │  ├── Kconfig.defconfig.nrf7120_enga_cpuflpr
│  │  │  ├── Kconfig.soc
│  │  │  ├── align.ld
│  │  │  ├── kmu_push_area_section.ld
│  │  │  ├── soc.c
│  │  │  │ soc.h
│  │  │ soc.yml
zephyr
│  │ module.yml

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 249
  • ✅ Integration tests
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

soc/nordic/Kconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/nordic/Kconfig.soc Outdated Show resolved Hide resolved
soc/nordic/nrf71/CMakeLists.txt Outdated Show resolved Hide resolved
soc/nordic/nrf71/Kconfig.soc Show resolved Hide resolved
soc/nordic/nrf71/soc.c Outdated Show resolved Hide resolved
series:
- name: nrf71
socs:
- name: nrf7120_enga
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- name: nrf7120_enga
- name: nrf7120

The board can select the revision'd Kconfig but there is only one SoC

boards/nordic/nrf7120pdk/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/nordic/nrf7120pdk/Kconfig.nrf7120pdk Outdated Show resolved Hide resolved
@nordicjm
Copy link
Contributor

also shouldn't be e.g. noup in sdk-nrf commit titles, that is for sdk-* OSS repos only

@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch 2 times, most recently from b6ae797 to 338f9ac Compare January 24, 2025 16:03
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 338f9ac to 58c71c8 Compare January 27, 2025 10:27
dts/arm/nordic/nrf7120_enga.dtsi Show resolved Hide resolved
dts/arm/nordic/nrf7120_enga.dtsi Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
dts/riscv/nordic/nrf7120_enga_cpuflpr.dtsi Outdated Show resolved Hide resolved
Comment on lines +8 to +12
config NRF_MPC_REGION_SIZE
hex
default 0x1000
help
Region size for the Memory Protection Controller (MPC) in bytes.
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be in dts

Comment on lines +14 to +32
config NRF_TRUSTZONE_FLASH_REGION_SIZE
hex
default NRF_MPC_REGION_SIZE
help
This defines the flash region size from the TRUSTZONE perspective.
It is used when configuring the TRUSTZONE and when setting alignments
requirements for the partitions.
This abstraction allows us to configure TRUSTZONE without depending
on peripheral specific symbols.

config NRF_TRUSTZONE_RAM_REGION_SIZE
hex
default NRF_MPC_REGION_SIZE
help
This defines the RAM region size from the TRUSTZONE perspective.
It is used when configuring the TRUSTZONE and when setting alignments
requirements for the partitions.
This abstraction allows us to configure TRUSTZONE without depending
on peripheral specific symbols.
Copy link
Contributor

Choose a reason for hiding this comment

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

there are not anything to do with a board

@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 58c71c8 to d1e423f Compare January 29, 2025 13:11
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from d1e423f to 501616d Compare January 29, 2025 16:56
rob-robinson-14 and others added 7 commits January 29, 2025 17:03
Add dts files for nRF7120

Signed-off-by: David Jewsbury <[email protected]>
Co-authored-by: Robert Robinson <[email protected]>
Add nRF7120 to soc directory

Signed-off-by: Robert Robinson <[email protected]>
Co-authored-by: David Jewsbury <[email protected]>
Add board files for nRF7120pdk

Signed-off-by: David Jewsbury <[email protected]>
Co-authored-by: Robert Robinson <[email protected]>
This adds the nrf7120pdk/cpuapp/ns board variant to sdk-zephyr.
It allows to build nrf7120pdk with TF-M in nRF Connect SDK.

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

Signed-off-by: Robert Robinson <[email protected]>
The SoftDevice Controller is a different controller than
the open source link layer with a different set of quirks.
It should therefore have its own device tree binding.

This commit converts the SoftDevice Controller driver
to use this new DTS binding instead of reusing the existing one.

This commit updates or adds additional overlays for
existing samples, applications and tests that were using the
open source link layer.

Signed-off-by: Robert Robinson <[email protected]>
nRF7120 has been added to soc folder in NCS, therefore, soc_root needs to be added to module.yml

Signed-off-by: David Jewsbury <[email protected]>
The license agreement for files within sdk-nrf differs from what
will eventually be required from upstream zephyr.

All SPDX-License-Identifier: Apache-2.0 have been updated to SPDX-License-Identifier: LicenseRef-Nordic-5-Clause

Signed-off-by: Robert Robinson <[email protected]>
@rob-robinson-14 rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from 501616d to f73fc0b Compare January 29, 2025 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants