michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: rename circuitdojo_feather_nrf9160ns

Browse source 
Change the 'ns' suffix to '_ns' for consistency with other boards.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2021-09-17 13:49:41 -07:00 • committed by Christopher Friedt
commit 5854bc3a48
6 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/circuitdojo_feather_nrf9160/Kconfig.board
View file

@ -9,7 +9,7 @@ if SOC_NRF9160_SICA
config BOARD_CIRCUITDOJO_FEATHER_NRF9160 config BOARD_CIRCUITDOJO_FEATHER_NRF9160
bool "Circuit Dojo nRF9160 Feather" bool "Circuit Dojo nRF9160 Feather"
config BOARD_CIRCUITDOJO_FEATHER_NRF9160NS config BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
bool "Circuit Dojo nRF9160 Feather non-secure" bool "Circuit Dojo nRF9160 Feather non-secure"
endif # SOC_NRF9160_SICA endif # SOC_NRF9160_SICA

8
boards/arm/circuitdojo_feather_nrf9160/Kconfig.defconfig
View file

@ -4,7 +4,7 @@
# Copyright (c) 2020 Circuit Dojo LLC # Copyright (c) 2020 Circuit Dojo LLC
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160NS if BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
config BOARD config BOARD
default "circuitdojo_feather_nrf9160" default "circuitdojo_feather_nrf9160"
@ -26,7 +26,7 @@ config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
depends on BOARD_CIRCUITDOJO_FEATHER_NRF9160 && TRUSTED_EXECUTION_SECURE depends on BOARD_CIRCUITDOJO_FEATHER_NRF9160 && TRUSTED_EXECUTION_SECURE
if BOARD_CIRCUITDOJO_FEATHER_NRF9160NS if BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
config FLASH_LOAD_OFFSET config FLASH_LOAD_OFFSET
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@ -34,6 +34,6 @@ config FLASH_LOAD_OFFSET
config FLASH_LOAD_SIZE config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160NS endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS
endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160NS endif # BOARD_CIRCUITDOJO_FEATHER_NRF9160 || BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS

0
boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160ns.dts → boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.dts
View file

2
boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160ns.yaml → boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns.yaml
View file

@ -1,4 +1,4 @@
identifier: circuitdojo_feather_nrf9160ns identifier: circuitdojo_feather_nrf9160_ns
name: CircuitDojo-Feather-nRF9160-Non-Secure name: CircuitDojo-Feather-nRF9160-Non-Secure
type: mcu type: mcu
arch: arm arch: arm

2
boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160ns_defconfig → boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_ns_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF91X=y CONFIG_SOC_SERIES_NRF91X=y
CONFIG_SOC_NRF9160_SICA=y CONFIG_SOC_NRF9160_SICA=y
CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160NS=y CONFIG_BOARD_CIRCUITDOJO_FEATHER_NRF9160_NS=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

1
boards/deprecated.cmake
View file

@ -14,3 +14,4 @@ set(musca_b1_nonsecure_DEPRECATED musca_b1_ns)
set(musca_s1_nonsecure_DEPRECATED musca_s1_ns) set(musca_s1_nonsecure_DEPRECATED musca_s1_ns)
set(nrf5340dk_nrf5340_cpuappns_DEPRECATED nrf5340dk_nrf5340_cpuapp_ns) set(nrf5340dk_nrf5340_cpuappns_DEPRECATED nrf5340dk_nrf5340_cpuapp_ns)
set(nrf9160dk_nrf9160ns_DEPRECATED nrf9160dk_nrf9160_ns) set(nrf9160dk_nrf9160ns_DEPRECATED nrf9160dk_nrf9160_ns)
set(circuitdojo_feather_nrf9160ns_DEPRECATED circuitdojo_feather_nrf9160_ns)