Skip to content

Commit 3195165

Browse files
carlescufikartben
authored andcommitted
soc: nordic: nRF54L: Move a few options from boards to the SoC definition
A few option defaults that were so far defined in the board _defconfig files are actually entirely SoC family (nRF54L) dependant, so it makes much more sense to have them defined at the SoC family level in order for all boards based on these SoCs to automatically inherit them. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
1 parent 1530e86 commit 3195165

File tree

6 files changed

+17
-55
lines changed

6 files changed

+17
-55
lines changed

boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
1616

1717
# Enable hardware stack protection
1818
CONFIG_HW_STACK_PROTECTION=y
19-
20-
# MPU-based null-pointer dereferencing detection cannot
21-
# be applied as the (0x0 - 0x400) is unmapped for this target.
22-
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
23-
24-
# Enable Cache
25-
CONFIG_CACHE_MANAGEMENT=y
26-
CONFIG_EXTERNAL_CACHE=y
27-
28-
# Start SYSCOUNTER on driver init
29-
CONFIG_NRF_GRTC_START_SYSCOUNTER=y

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
1616

1717
# Enable hardware stack protection
1818
CONFIG_HW_STACK_PROTECTION=y
19-
20-
# MPU-based null-pointer dereferencing detection cannot
21-
# be applied as the (0x0 - 0x400) is unmapped for this target.
22-
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
23-
24-
# Enable Cache
25-
CONFIG_CACHE_MANAGEMENT=y
26-
CONFIG_EXTERNAL_CACHE=y
27-
28-
# Start SYSCOUNTER on driver init
29-
CONFIG_NRF_GRTC_START_SYSCOUNTER=y

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
1616

1717
# Enable hardware stack protection
1818
CONFIG_HW_STACK_PROTECTION=y
19-
20-
# MPU-based null-pointer dereferencing detection cannot
21-
# be applied as the (0x0 - 0x400) is unmapped for this target.
22-
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
23-
24-
# Enable Cache
25-
CONFIG_CACHE_MANAGEMENT=y
26-
CONFIG_EXTERNAL_CACHE=y
27-
28-
# Start SYSCOUNTER on driver init
29-
CONFIG_NRF_GRTC_START_SYSCOUNTER=y

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
1616

1717
# Enable hardware stack protection
1818
CONFIG_HW_STACK_PROTECTION=y
19-
20-
# MPU-based null-pointer dereferencing detection cannot
21-
# be applied as the (0x0 - 0x400) is unmapped for this target.
22-
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
23-
24-
# Enable Cache
25-
CONFIG_CACHE_MANAGEMENT=y
26-
CONFIG_EXTERNAL_CACHE=y
27-
28-
# Start SYSCOUNTER on driver init
29-
CONFIG_NRF_GRTC_START_SYSCOUNTER=y

boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,3 @@ CONFIG_ARM_MPU=y
1616

1717
# Enable hardware stack protection
1818
CONFIG_HW_STACK_PROTECTION=y
19-
20-
# MPU-based null-pointer dereferencing detection cannot
21-
# be applied as the (0x0 - 0x400) is unmapped for this target.
22-
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
23-
24-
# Enable Cache
25-
CONFIG_CACHE_MANAGEMENT=y
26-
CONFIG_EXTERNAL_CACHE=y
27-
28-
# Start SYSCOUNTER on driver init
29-
CONFIG_NRF_GRTC_START_SYSCOUNTER=y

soc/nordic/nrf54l/Kconfig.defconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,26 @@ if ARM
1212
config CORTEX_M_SYSTICK
1313
default !NRF_GRTC_TIMER
1414

15+
# Start SYSCOUNTER on driver init
16+
config NRF_GRTC_START_SYSCOUNTER
17+
default NRF_GRTC_TIMER
18+
1519
config CACHE_NRF_CACHE
1620
default y if EXTERNAL_CACHE
1721

22+
config CACHE_MANAGEMENT
23+
default y
24+
25+
choice CACHE_TYPE
26+
default EXTERNAL_CACHE
27+
endchoice
28+
29+
# MPU-based null-pointer dereferencing detection cannot
30+
# be applied as the (0x0 - 0x400) is unmapped for this target.
31+
choice NULL_POINTER_EXCEPTION_DETECTION
32+
default NULL_POINTER_EXCEPTION_DETECTION_NONE
33+
endchoice
34+
1835
endif # ARM
1936

2037
if RISCV

0 commit comments

Comments
 (0)