nordic_nrf: Fix UART and FLASH build issues

The nordic platforms enable SECURE_UART1 by default,
enabling this without TFM_SPM_LOG_RAW_ENABLED doesn't make sense
since it will configure a UART as secure and then it will not use
it. This also causes a building issue since the code expects both
these two options to be enabled.

Also fixes a building issue related to flash. The cmsis flash driver
is used by both PLATFORM_DEFAULT_OTP and byITS but it was only
included when ITS was build. So it was failing for builds with
PLATFORM_DEFAULT_OTP and without ITS

Signed-off-by: Georgios Vasilakis <[email protected]>
Change-Id: I4f8f75ec2a2817634c190ebb844b9be9cc7f1a45
(cherry picked from commit c4f46d4)

Author: Vge0rge

platform/ext/target/nordic_nrf/common/core/CMakeLists.txt

@@ -78,9 +78,11 @@ target_include_directories(platform_s
         services/include
 )
 
+if(PLATFORM_DEFAULT_OTP OR TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
 set(nvm_sources
-  $<$<BOOL:${TFM_PARTITION_INTERNAL_TRUSTED_STORAGE}>:${CMAKE_CURRENT_SOURCE_DIR}/cmsis_drivers/Driver_Flash.c>
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmsis_drivers/Driver_Flash.c
 )
+endif()
 
 if(HAS_RRAMC)
   list(APPEND nvm_sources

platform/ext/target/nordic_nrf/common/core/config.cmake

@@ -45,3 +45,4 @@ set(CONFIG_TFM_USE_TRUSTZONE            ON)
 set(TFM_MULTI_CORE_TOPOLOGY             OFF)
 
 set(NRF_SECURE_UART_INSTANCE            1           CACHE STRING  "The UART instance number to use for secure UART")
+set(TFM_SPM_LOG_RAW_ENABLED             ON         CACHE BOOL      "Enable LOG raw")