Skip to content

Commit c8a921e

Browse files
nordicjmnordicjm
committed
[nrf fromtree] soc: nordic: nrf54l: Set ROM_START_OFFSET instead of by each board
Sets the default of this Kconfig for the SoC itself as a default, rather than each board setting it, which minimises the change Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 69ce66d)
1 parent 847d6b8 commit c8a921e

File tree

9 files changed

+3
-50
lines changed

9 files changed

+3
-50
lines changed

‎boards/ezurio/bl54l15_dvk/Kconfig.defconfig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
77
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
88

9-
if BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP
10-
11-
config ROM_START_OFFSET
12-
default 0x800 if BOOTLOADER_MCUBOOT
13-
14-
endif # BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP
15-
169
if BOARD_BL54L15_DVK_NRF54L10_CPUAPP_NS || BOARD_BL54L15_DVK_NRF54L15_CPUAPP_NS
1710

1811
config HAS_BT_CTLR

‎boards/ezurio/bl54l15u_dvk/Kconfig.defconfig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
77
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
88

9-
if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP
10-
11-
config ROM_START_OFFSET
12-
default 0x800 if BOOTLOADER_MCUBOOT
13-
14-
endif # BOARD_BL54L15U_DVK_NRF54L15_CPUAPP
15-
169
if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP_NS
1710

1811
config HAS_BT_CTLR

‎boards/nordic/nrf54l15dk/Kconfig.defconfig‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
config HW_STACK_PROTECTION
55
default ARCH_HAS_STACK_PROTECTION
66

7-
if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
8-
BOARD_NRF54L15DK_NRF54L15_CPUAPP
9-
10-
config ROM_START_OFFSET
11-
default 0x800 if BOOTLOADER_MCUBOOT
12-
13-
endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
14-
# BOARD_NRF54L15DK_NRF54L15_CPUAPP
15-
167
if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
178

189
config BOARD_NRF54L15DK

‎boards/nordic/nrf54lm20dk/Kconfig.defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@ if BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP
66
config HW_STACK_PROTECTION
77
default ARCH_HAS_STACK_PROTECTION
88

9-
config ROM_START_OFFSET
10-
default 0x800 if BOOTLOADER_MCUBOOT
11-
129
endif # BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP

‎boards/panasonic/panb611evb/Kconfig.defconfig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
66
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
77

8-
if BOARD_PANB611EVB_NRF54L15_CPUAPP
9-
10-
config ROM_START_OFFSET
11-
default 0x800 if BOOTLOADER_MCUBOOT
12-
13-
endif # BOARD_PANB611EVB_NRF54L15_CPUAPP
14-
158
if BOARD_PANB611EVB_NRF54L15_CPUAPP_NS
169

1710
config HAS_BT_CTLR

‎boards/raytac/an54l15q_db/Kconfig.defconfig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
77
DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
88

9-
if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP
10-
11-
config ROM_START_OFFSET
12-
default 0x800 if BOOTLOADER_MCUBOOT
13-
14-
endif # BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP
15-
169
if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP_NS
1710

1811
config HAS_BT_CTLR

‎boards/seeed/xiao_nrf54l15/Kconfig.defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ if BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP
55
config HAS_BT_CTLR
66
default BT
77

8-
config ROM_START_OFFSET
9-
default 0x800 if BOOTLOADER_MCUBOOT
10-
118
endif # BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP

‎boards/we/ophelia4ev/Kconfig.defconfig‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,3 @@
33

44
config HW_STACK_PROTECTION
55
default ARCH_HAS_STACK_PROTECTION
6-
7-
if BOARD_OPHELIA4EV_NRF54L15_CPUAPP
8-
9-
config ROM_START_OFFSET
10-
default 0x800 if BOOTLOADER_MCUBOOT
11-
12-
endif # BOARD_OPHELIA4EV_NRF54L15_CPUAPP

‎soc/nordic/nrf54l/Kconfig.defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ choice NULL_POINTER_EXCEPTION_DETECTION
3232
default NULL_POINTER_EXCEPTION_DETECTION_NONE
3333
endchoice
3434

35+
config ROM_START_OFFSET
36+
default 0x800 if BOOTLOADER_MCUBOOT
37+
3538
endif # ARM
3639

3740
if RISCV

0 commit comments

Comments
 (0)