Skip to content

Commit

Permalink
SPM: Remove SPM and its secure services
Browse files Browse the repository at this point in the history
Remove the Secure Partition Manager (SPM) and the secure services its
exposed.
Remove all sample support for using the SPM.

NCSDK-18315

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
  • Loading branch information
joerchan authored and carlescufi committed Dec 13, 2022
1 parent a49e3e8 commit b386dd9
Show file tree
Hide file tree
Showing 62 changed files with 12 additions and 2,574 deletions.
3 changes: 0 additions & 3 deletions .github/test-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
- "include/fprotect.h"
- "include/fw_info.*"
- "include/mgmt/*"
- "include/spm.h"
- "include/dfu/**/*"
- "include/net/**/*"
- "cmake/*"
Expand All @@ -126,7 +125,6 @@
- "subsys/fw_info/**/*"
- "subsys/mgmt/**/*"
- "subsys/pcd/*"
- "subsys/spm/*"
- "subsys/net/lib/*fota*/**/*"
- "subsys/net/lib/download_client/**/*"
- "tests/subsys/bootloader/**/*"
Expand All @@ -148,7 +146,6 @@
- "subsys/bootloader/**/*"
- "subsys/partition_manager/**/*"
- "tests/modules/tfm"
- "tests/subsys/spm/secure_services/**/*"
- "tests/tfm/**/*"

"CI-ble-test":
Expand Down
3 changes: 0 additions & 3 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ Kconfig* @tejlmand
/samples/nrf9160/modem_shell/ @trantanen @hiltunent @jhirsi @tokangas
/samples/nrf9160/nrf_cloud_* @plskeggs @jayteemo @glarsennordic
/samples/nrf9160/modem_trace_flash/ @gregersrygg @balaji-nordic
/samples/spm/ @lemrey @hakonfam @SebastianBoe
/samples/openthread/ @rlubos @edmont @canisLupus1313 @mariuszpos
/samples/nrf_profiler/ @pdunaj
/samples/peripheral/radio_test/ @KAGA164 @maje-emb
Expand Down Expand Up @@ -211,7 +210,6 @@ Kconfig* @tejlmand
/subsys/pcd/ @hakonfam
/subsys/nrf_profiler/ @pdunaj
/subsys/shell/ @nordic-krch
/subsys/spm/ @SebastianBoe
/subsys/nonsecure/ @SebastianBoe
/modules/ @tejlmand
/modules/tfm/ @SebastianBoe @joerchan
Expand Down Expand Up @@ -266,7 +264,6 @@ Kconfig* @tejlmand
/tests/subsys/partition_manager/region/ @hakonfam @sigvartmh
/tests/subsys/pcd/ @hakonfam @sigvartmh
/tests/subsys/nrf_profiler/ @pdunaj @MarekPieta
/tests/subsys/spm/ @oyvindronningstad @SebastianBoe
/tests/subsys/zigbee/ @tomchy @sebastiandraus
/tests/tfm/ @SebastianBoe @joerchan @torsteingrindvik @magnev
/tests/unity/ @nordic-krch
Expand Down
10 changes: 3 additions & 7 deletions Kconfig.nrf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ config NET_SOCKETS_OFFLOAD_TLS
# - For CC3XX RNG
config MAIN_STACK_SIZE
default 2048 if ZTEST
default 2048 if ENTROPY_CC3XX && !(SPM || BUILD_WITH_TFM)
default 2048 if ENTROPY_CC3XX && !BUILD_WITH_TFM

config ZTEST_STACK_SIZE
default 2048 if ZTEST
Expand All @@ -73,22 +73,18 @@ config MCUMGR_BUF_SIZE
config BT_BUF_CMD_TX_COUNT
default 10 if SOC_NRF5340_CPUAPP || SOC_NRF5340_CPUNET

# Set ENTROPY_GENERATOR to true for TF-M or SPM builds with enabled
# Set ENTROPY_GENERATOR to true for TF-M builds with enabled
# RNG provided from secure services.
config ENTROPY_GENERATOR
default y if BUILD_WITH_TFM || (SPM && SPM_SECURE_SERVICES)
default y if BUILD_WITH_TFM

config INIT_ARCH_HW_AT_BOOT
default n if SPM
default y
help
The image will be booted directly by an unknown image which might not
leave the system in a clean state, so it is necessary to perform
architecture specific hardware initialization.

config LINKER_LAST_SECTION_ID
default n if IS_SPM

DT_COMPAT_NORDIC_QSPI_NOR := nordic,qspi-nor
config NORDIC_QSPI_NOR
default y if $(dt_compat_on_bus,$(DT_COMPAT_NORDIC_QSPI_NOR),qspi) && PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY && !SPI_NOR
Expand Down
9 changes: 0 additions & 9 deletions applications/asset_tracker_v2/child_image/spm.conf

This file was deleted.

13 changes: 0 additions & 13 deletions applications/serial_lte_modem/child_image/spm.conf

This file was deleted.

5 changes: 1 addition & 4 deletions boards/arm/thingy91_nrf9160/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ endif()
if(CONFIG_BOARD_THINGY91_NRF9160_NS)
# If TF-M is used, the ADP5360 configuration must be done in non-secure
# as we can't instruct TF-M to run it.
# If SPM is used instead, it will run the ADP5360 configuration in secure.
if(CONFIG_BUILD_WITH_TFM)
zephyr_library()
zephyr_library_sources(adp5360_init.c)
Expand All @@ -21,9 +20,7 @@ if(CONFIG_BOARD_THINGY91_NRF9160_NS)
# Use static partition layout to ensure the partition layout remains
# unchanged after DFU. This needs to be made globally available
# because it is used in other CMake files.
if (CONFIG_SPM)
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static_spm.yml CACHE INTERNAL "")
elseif(CONFIG_LWM2M_CARRIER)
if(CONFIG_LWM2M_CARRIER)
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static_lwm2m_carrier.yml CACHE INTERNAL "")
else()
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_LIST_DIR}/thingy91_pm_static.yml CACHE INTERNAL "")
Expand Down
47 changes: 0 additions & 47 deletions boards/arm/thingy91_nrf9160/thingy91_pm_static_spm.yml

This file was deleted.

9 changes: 0 additions & 9 deletions dts/bindings/serial/nordic,nrf-spm-uart.yaml

This file was deleted.

169 changes: 0 additions & 169 deletions include/secure_services.h

This file was deleted.

Loading

0 comments on commit b386dd9

Please sign in to comment.