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

rob-robinson-14 · 2025-01-24T12:44:05Z

PR containing out of tree definitions for nrf7120.

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]>

CLAassistant · 2025-01-24T12:44:10Z

All committers have signed the CLA.

NordicBuilder · 2025-01-24T12:48:30Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 4

Inputs:

Sources:

sdk-nrf: PR head: 338f9acb30b452b1ca8751c122b6351b2eea7b2b

more details

sdk-nrf:

PR head: 338f9acb30b452b1ca8751c122b6351b2eea7b2b
merge base: 085e5a678ca84a3b5c8cd2e0c3b41de872f4b9cf
target head (main): a638e5f6114bec3a4570510338fd7177986cb179
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 (39)

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.defconfig
│  │  ├── 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:
Build docker image:

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

◻️ Toolchain
◻️ Build twister
◻️ Integration tests

Disabled integration tests

- desktop52_verification
- doc-internal
- test_ble_nrf_config
- test-fw-nrfconnect-apps
- 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_libmodem-nrf
- 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 · 2025-01-24T13:01:24Z

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

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

nordicjm · 2025-01-24T15:38:20Z

soc/nordic/Kconfig

+config SOC_FAMILY_NORDIC_NRF
+	select SOC_COMPATIBLE_NRF
+	select SOC_RESET_HOOK if ARM


should not be here since it exists in zephyr already

nordicjm · 2025-01-24T15:38:46Z

soc/nordic/Kconfig

+if SOC_FAMILY_NORDIC_NRF
+
+rsource "*/Kconfig"
+source "$ZEPHYR_BASE/soc/nordic/Kconfig"


this should already be sourced really

nordicjm · 2025-01-24T15:39:19Z

soc/nordic/Kconfig.defconfig

+
+rsource "*/Kconfig.defconfig"
+
+# If the kernel has timer support, enable clock control


all duplicated from upstream, needs to go

nordicjm · 2025-01-24T15:39:29Z

soc/nordic/Kconfig.soc

+config SOC_FAMILY_NORDIC_NRF
+	bool
+
+config SOC_FAMILY
+	default "nordic_nrf" if SOC_FAMILY_NORDIC_NRF


nordicjm · 2025-01-24T15:39:44Z

soc/nordic/nrf71/CMakeLists.txt

+# Exclamation mark is printable character with the lowest number in ASCII table.
+# We are sure that this file will be included first.
+zephyr_linker_sources(RAM_SECTIONS SORT_KEY ! kmu_push_area_section.ld)


2 space indent

nordicjm · 2025-01-24T15:42:07Z

soc/nordic/nrf71/Kconfig.soc

+config SOC
+	default "nrf7120" if SOC_NRF7120_ENGA


default "nrf7120" if SOC_NRF7120 and also needs a SOC_NRF7120 symbol - see upstream zephyr soc/nrf54l/Kconfig.soc to see how to do this

nordicjm · 2025-01-24T15:42:22Z

soc/nordic/nrf71/soc.c

+{
+	/* Enable ICACHE */
+	sys_cache_instr_enable();
+


Suggested change

nordicjm · 2025-01-24T15:43:43Z

soc/nordic/soc.yml

+    series:
+      - name: nrf71
+        socs:
+          - name: nrf7120_enga


Suggested change

- name: nrf7120_enga

- name: nrf7120

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

nordicjm · 2025-01-24T15:43:58Z

boards/nordic/nrf7120pdk/Kconfig.defconfig

@@ -0,0 +1,12 @@
+


spacing in this file needs fixing

nordicjm · 2025-01-24T15:44:06Z

boards/nordic/nrf7120pdk/Kconfig.nrf7120pdk

+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+config BOARD_NRF7120PDK
+<<<<<<< HEAD


git conflict markers?

nordicjm · 2025-01-24T15:44:44Z

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

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 Robinsin <[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 Robinsin <[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 Robinsin <[email protected]>

rob-robinson-14 and others added 2 commits January 24, 2025 12:32

dts: arm: nordic: add support for Nordic nrf7120

85c80ce

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

soc: nordic: Add support for nRF7120 SoC

2ef9806

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

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

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

nordicjm reviewed Jan 24, 2025

View reviewed changes

rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from c40fbb1 to b6ae797 Compare January 24, 2025 15:57

rob-robinson-14 and others added 5 commits January 24, 2025 15:58

boards: nordic: Add nRF7120 PDK board

3259ea4

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

modules: Add support for soc directory in NCS

866ce56

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]>

rob-robinson-14 force-pushed the NRFX-6596-add-nrf7120-soc-board-definitions branch from b6ae797 to 338f9ac Compare January 24, 2025 16:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

rob-robinson-14 commented Jan 24, 2025

CLAassistant commented Jan 24, 2025 •

edited

Loading

NordicBuilder commented Jan 24, 2025 •

edited

Loading

NordicBuilder commented Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm Jan 24, 2025

nordicjm commented Jan 24, 2025


		rsource "*/Kconfig.defconfig"

		# If the kernel has timer support, enable clock control

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

Are you sure you want to change the base?

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

Conversation

rob-robinson-14 commented Jan 24, 2025

CLAassistant commented Jan 24, 2025 • edited Loading

NordicBuilder commented Jan 24, 2025 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

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

NordicBuilder commented Jan 24, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nordicjm commented Jan 24, 2025

CLAassistant commented Jan 24, 2025 •

edited

Loading

NordicBuilder commented Jan 24, 2025 •

edited

Loading