[nrf fromtree] platform: nordic_nrf: Convert nrf9160 SoC to nrf91 series

Convert the nrf9160 SoC support to be generic for nrf91 series.
Keep the preload.cmake SoC specific in ordec to set the correct
SoC definition.

Change-Id: I225634e15b827d5eeef9f47a12329f74e0774eeb
Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 4eea4ca)

Author: joerchan

platform/ext/target/nordic_nrf/common/core/nrfx_config.h

@@ -70,8 +70,8 @@
 
 #if defined(NRF5340_XXAA_APPLICATION)
     #include <nrfx_config_nrf5340_application.h>
-#elif defined(NRF9160_XXAA)
-    #include <nrfx_config_nrf9160.h>
+#elif defined(NRF91_SERIES)
+    #include <nrfx_config_nrf91.h>
 #else
     #error "Unknown device."
 #endif

…nordic_nrf/common/nrf9160/CMakeLists.txt …t/nordic_nrf/common/nrf91/CMakeLists.txtplatform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt renamed to platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt platform/ext/target/nordic_nrf/common/nrf9160/CMakeLists.txt renamed to platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt

@@ -16,20 +16,20 @@ add_subdirectory(../core nrf_common)
 # Specify the location of platform specific build dependencies.
 target_sources(tfm_s
     PRIVATE
-    $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf9160.c>
+    $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf91.c>
 )
 
 if(NS)
     target_sources(tfm_ns
         PRIVATE
-            $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf9160.c>
+            $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf91.c>
     )
 endif()
 
 if(BL2)
     target_sources(bl2
         PRIVATE
-            $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf9160.c>
+            $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/gcc/startup_nrf91.c>
     )
 endif()
 
@@ -42,7 +42,7 @@ target_include_directories(platform_s
 
 target_sources(platform_s
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf9160.c
+        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
 )
 
 target_compile_definitions(platform_s
@@ -62,7 +62,7 @@ target_include_directories(platform_ns
 
 target_sources(platform_ns
     PRIVATE
-        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf9160.c
+        ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
 )
 
 target_compile_definitions(platform_ns
@@ -81,7 +81,7 @@ if(BL2)
 
     target_sources(platform_bl2
         PRIVATE
-            ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf9160.c
+            ${HAL_NORDIC_PATH}/nrfx/mdk/system_nrf91.c
     )
 
     target_compile_definitions(platform_bl2

…t/nordic_nrf/common/nrf9160/config.cmake …get/nordic_nrf/common/nrf91/config.cmakeplatform/ext/target/nordic_nrf/common/nrf9160/config.cmake renamed to platform/ext/target/nordic_nrf/common/nrf91/config.cmake platform/ext/target/nordic_nrf/common/nrf9160/config.cmake renamed to platform/ext/target/nordic_nrf/common/nrf91/config.cmake

@@ -9,6 +9,7 @@
 include(${PLATFORM_PATH}/common/core/config.cmake)
 
 set(SECURE_UART1                        ON         CACHE BOOL      "Enable secure UART1")
+# Use nrf9160 until test target name in PSA arch test repository has been updated to nrf91
 set(PSA_API_TEST_TARGET                 "nrf9160"  CACHE STRING    "PSA API test target")
 set(NRF_NS_STORAGE                      OFF        CACHE BOOL      "Enable non-secure storage partition")
 set(BL2                                 ON         CACHE BOOL      "Whether to build BL2")

…nrf/common/nrf9160/gcc/startup_nrf9160.c …dic_nrf/common/nrf91/gcc/startup_nrf91.cplatform/ext/target/nordic_nrf/common/nrf9160/gcc/startup_nrf9160.c renamed to platform/ext/target/nordic_nrf/common/nrf91/gcc/startup_nrf91.c platform/ext/target/nordic_nrf/common/nrf9160/gcc/startup_nrf9160.c renamed to platform/ext/target/nordic_nrf/common/nrf91/gcc/startup_nrf91.c

@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NRFX_CONFIG_NRF9160_H__
-#define NRFX_CONFIG_NRF9160_H__
+#ifndef NRFX_CONFIG_NRF91_H__
+#define NRFX_CONFIG_NRF91_H__
 
 #ifndef NRFX_CONFIG_H__
 #error "This file should not be included directly. Include nrfx_config.h instead."
@@ -1643,4 +1643,4 @@
 
 // </h>
 
-#endif // NRFX_CONFIG_NRF9160_H__
+#endif // NRFX_CONFIG_NRF91_H__

…et/nordic_nrf/common/nrf9160/mmio_defs.h …rget/nordic_nrf/common/nrf91/mmio_defs.hplatform/ext/target/nordic_nrf/common/nrf9160/mmio_defs.h renamed to platform/ext/target/nordic_nrf/common/nrf91/mmio_defs.h platform/ext/target/nordic_nrf/common/nrf9160/mmio_defs.h renamed to platform/ext/target/nordic_nrf/common/nrf91/mmio_defs.h

@@ -18,7 +18,7 @@
 #ifndef __FLASH_LAYOUT_H__
 #define __FLASH_LAYOUT_H__
 
-/* Flash layout on NRF9160 with BL2:
+/* Flash layout on nRF91 with BL2:
  *
  * 0x0000_0000 BL2 - MCUBoot (64 KB)
  * 0x0001_0000 Primary image area (448 KB):
@@ -33,7 +33,7 @@
  * 0x000f_8000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
  *             otherwise unused (32 KB)
  *
- * Flash layout on NRF9160 without BL2:
+ * Flash layout on nRF91 without BL2:
  *
  * 0x0000_0000 Primary image area (960 KB):
  *    0x0000_0000 Secure     image primary (480 KB)
@@ -97,7 +97,7 @@
 #define FLASH_AREA_2_SIZE          (FLASH_S_PARTITION_SIZE + \
                                     FLASH_NS_PARTITION_SIZE)
 /* Not used, only the Non-swapping firmware upgrade operation
- * is supported on NRF9160.
+ * is supported on nRF91.
  */
 #define FLASH_AREA_SCRATCH_ID      (FLASH_AREA_2_ID + 1)
 #define FLASH_AREA_SCRATCH_OFFSET  (FLASH_AREA_2_OFFSET + FLASH_AREA_2_SIZE)
@@ -124,7 +124,7 @@
 #define FLASH_AREA_3_OFFSET        (FLASH_AREA_2_OFFSET + FLASH_AREA_2_SIZE)
 #define FLASH_AREA_3_SIZE          (FLASH_NS_PARTITION_SIZE)
 /* Not used, only the Non-swapping firmware upgrade operation
- * is supported on NRF9160.
+ * is supported on nRF91.
  */
 #define FLASH_AREA_SCRATCH_ID      (FLASH_AREA_3_ID + 1)
 #define FLASH_AREA_SCRATCH_OFFSET  (FLASH_AREA_3_OFFSET + FLASH_AREA_3_SIZE)
@@ -137,7 +137,7 @@
 #endif /* MCUBOOT_IMAGE_NUMBER */
 
 /* Not used, only the Non-swapping firmware upgrade operation
- * is supported on nRF9160. The maximum number of status entries
+ * is supported on nRF91. The maximum number of status entries
  * supported by the bootloader.
  */
 #define MCUBOOT_STATUS_MAX_ENTRIES      (0)

…nrf/common/nrf9160/nrfx_config_nrf9160.h …dic_nrf/common/nrf91/nrfx_config_nrf91.hplatform/ext/target/nordic_nrf/common/nrf9160/nrfx_config_nrf9160.h renamed to platform/ext/target/nordic_nrf/common/nrf91/nrfx_config_nrf91.h platform/ext/target/nordic_nrf/common/nrf9160/nrfx_config_nrf9160.h renamed to platform/ext/target/nordic_nrf/common/nrf91/nrfx_config_nrf91.h

@@ -43,7 +43,7 @@
 #define PSA_INITIAL_ATTEST_TOKEN_MAX_SIZE   (0x250)
 
 /*
- * SPU flash region granularity is 32 KB on nRF9160. Alignment
+ * SPU flash region granularity is 32 KB on nRF91. Alignment
  * of partitions is defined in accordance with this constraint.
  */
 #ifdef NRF_NS_SECONDARY