michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: rename nrf9160_innblue22ns

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:57:25 -07:00 • committed by Christopher Friedt
commit 41e87ae688
7 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ if SOC_NRF9160_SICA
config BOARD_NRF9160_INNBLUE22
bool "nRF9160 innblue v2.2"
config BOARD_NRF9160_INNBLUE22NS
config BOARD_NRF9160_INNBLUE22_NS
bool "nRF9160 innblue V2.2 non-secure"
endif # SOC_NRF9160_SICA

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

@ -3,7 +3,7 @@
# Copyright (c) 2020 InnBlue
# SPDX-License-Identifier: Apache-2.0
if BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22NS
if BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22_NS
config BOARD
default "nrf9160_innblue22"
@ -29,7 +29,7 @@ config FLASH_LOAD_SIZE
endif # BOARD_NRF9160_INNBLUE22 && TRUSTED_EXECUTION_SECURE
if BOARD_NRF9160_INNBLUE22NS
if BOARD_NRF9160_INNBLUE22_NS
config FLASH_LOAD_OFFSET
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
@ -37,9 +37,9 @@ config FLASH_LOAD_OFFSET
config FLASH_LOAD_SIZE
default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
endif # BOARD_NRF9160_INNBLUE22NS
endif # BOARD_NRF9160_INNBLUE22_NS
config BT_HCI_VS
default y if BT
endif # BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22NS
endif # BOARD_NRF9160_INNBLUE22 || BOARD_NRF9160_INNBLUE22_NS

2
boards/arm/nrf9160_innblue22/doc/index.rst
View file

@ -97,7 +97,7 @@ The process requires the following steps:
1. Build the Secure Zephyr application using ``-DBOARD=nrf9160_innblue22`` and
``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the the application project configuration file.
2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160_innblue22ns``.
2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9160_innblue22_ns``.
3. Merge the two binaries together.
When building a Secure/Non-Secure application, the Secure application will

0
boards/arm/nrf9160_innblue22/nrf9160_innblue22ns.dts → boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.dts
View file

2
boards/arm/nrf9160_innblue22/nrf9160_innblue22ns.yaml → boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns.yaml
View file

@ -1,4 +1,4 @@
identifier: nrf9160_innblue22ns
identifier: nrf9160_innblue22_ns
name: nRF9160-INNBLUE22-Non-Secure
type: mcu
arch: arm

2
boards/arm/nrf9160_innblue22/nrf9160_innblue22ns_defconfig → boards/arm/nrf9160_innblue22/nrf9160_innblue22_ns_defconfig
View file

@ -4,7 +4,7 @@
# SOC / Board
CONFIG_SOC_SERIES_NRF91X=y
CONFIG_SOC_NRF9160_SICA=y
CONFIG_BOARD_NRF9160_INNBLUE22NS=y
CONFIG_BOARD_NRF9160_INNBLUE22_NS=y
# Enable MPU
CONFIG_ARM_MPU=y

1
boards/deprecated.cmake
View file

@ -16,3 +16,4 @@ set(nrf5340dk_nrf5340_cpuappns_DEPRECATED nrf5340dk_nrf5340_cpuapp_ns)
set(nrf9160dk_nrf9160ns_DEPRECATED nrf9160dk_nrf9160_ns)
set(circuitdojo_feather_nrf9160ns_DEPRECATED circuitdojo_feather_nrf9160_ns)
set(nrf9160_innblue21ns_DEPRECATED nrf9160_innblue21_ns)
set(nrf9160_innblue22ns_DEPRECATED nrf9160_innblue22_ns)