Skip to content

Commit f19ebe4

Browse files
mbolivar-nordiccarlescufi
mbolivar-nordic
authored and
carlescufi
committed
[nrf fromlist] boards: rename thingy53_nrf5340_cpuappns
Upstream PR: zephyrproject-rtos/zephyr#38642 Change the 'ns' suffix to '_ns' for consistency with other boards. Signed-off-by: Martí Bolívar <[email protected]>
1 parent 6bfc48e commit f19ebe4

9 files changed

+12
-11
lines changed

‎boards/arm/thingy53_nrf5340/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2021 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if (CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS)
4+
if (CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
55
zephyr_library()
66
zephyr_library_sources(board.c)
77
endif()

‎boards/arm/thingy53_nrf5340/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ config IPM_MSG_CH_1_RX
5252

5353
endif # RPMSG_SERVICE_DUAL_IPM_SUPPORT
5454

55-
if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
55+
if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
5656

5757
config BOARD_ENABLE_DCDC_APP
5858
bool "Enable Application MCU DCDC converter"
@@ -93,7 +93,7 @@ config DOMAIN_CPUNET_BOARD
9393
another board. For example hci_rpmsg on the nRF5340_cpunet for
9494
Bluetooth applications.
9595

96-
endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
96+
endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
9797

9898
if BOARD_THINGY53_NRF5340_CPUNET
9999

‎boards/arm/thingy53_nrf5340/Kconfig.board

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if SOC_NRF5340_CPUAPP_QKAA
88
config BOARD_THINGY53_NRF5340_CPUAPP
99
bool "Thingy53 nRF5340 Application MCU"
1010

11-
config BOARD_THINGY53_NRF5340_CPUAPPNS
11+
config BOARD_THINGY53_NRF5340_CPUAPP_NS
1212
bool "Thingy53 nRF5340 Application MCU non-secure"
1313

1414
endif # SOC_NRF5340_CPUAPP_QKAA

‎boards/arm/thingy53_nrf5340/Kconfig.defconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2021 Nordic Semiconductor ASA
44
# SPDX-License-Identifier: Apache-2.0
55

6-
if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
6+
if BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
77

88
config BOARD
99
default "thingy53_nrf5340_cpuapp"
@@ -46,15 +46,15 @@ config SRAM_SIZE
4646

4747
endif # BOARD_THINGY53_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
4848

49-
if BOARD_THINGY53_NRF5340_CPUAPPNS
49+
if BOARD_THINGY53_NRF5340_CPUAPP_NS
5050

5151
config FLASH_LOAD_OFFSET
5252
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
5353

5454
config FLASH_LOAD_SIZE
5555
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
5656

57-
endif # BOARD_THINGY53_NRF5340_CPUAPPNS
57+
endif # BOARD_THINGY53_NRF5340_CPUAPP_NS
5858

5959
if !TRUSTED_EXECUTION_SECURE
6060

@@ -88,7 +88,7 @@ config REGULATOR
8888

8989
endif # !TRUSTED_EXECUTION_SECURE
9090

91-
endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPPNS
91+
endif # BOARD_THINGY53_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP_NS
9292

9393
if BOARD_THINGY53_NRF5340_CPUNET
9494

‎boards/arm/thingy53_nrf5340/board.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS)
3+
if(CONFIG_BOARD_THINGY53_NRF5340_CPUAPP OR CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS)
44
board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
55
endif()
66

‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.dts renamed to ‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns.dts

File renamed without changes.

‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns.yaml renamed to ‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
identifier: thingy53_nrf5340_cpuappns
1+
identifier: thingy53_nrf5340_cpuapp_ns
22
name: Thingy53-NRF5340-application-MCU-Non-Secure
33
type: mcu
44
arch: arm

‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuappns_defconfig renamed to ‎boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpuapp_ns_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
CONFIG_SOC_SERIES_NRF53X=y
44
CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
5-
CONFIG_BOARD_THINGY53_NRF5340_CPUAPPNS=y
5+
CONFIG_BOARD_THINGY53_NRF5340_CPUAPP_NS=y
66

77
# Enable MPU
88
CONFIG_ARM_MPU=y

‎boards/deprecated.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ set(circuitdojo_feather_nrf9160ns_DEPRECATED circuitdojo_feather_nrf9160_ns)
1818
set(nrf9160_innblue21ns_DEPRECATED nrf9160_innblue21_ns)
1919
set(nrf9160_innblue22ns_DEPRECATED nrf9160_innblue22_ns)
2020
set(sparkfun_thing_plus_nrf9160ns_DEPRECATED sparkfun_thing_plus_nrf9160_ns)
21+
set(thingy53_nrf5340_cpuappns_DEPRECATED thingy53_nrf5340_cpuapp_ns)

0 commit comments

Comments
 (0)