[nrf noup] drivers: flash: Update to support PM removal

Update conditions for soc_secure_mem_read
to support Non-Secure builds without
Partition Manager.
noup as Partition Manager is a NCS construct.

Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>

Author: degjorva

drivers/flash/soc_flash_nrf.c

@@ -36,10 +36,12 @@ LOG_MODULE_REGISTER(flash_nrf);
 
 #define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE
 #include <soc_secure.h>
+#if USE_PARTITION_MANAGER
 #include <pm_config.h>
-#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER */
+#endif /* USE_PARTITION_MANAGER */
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
 
 #ifndef CONFIG_SOC_FLASH_NRF_RADIO_SYNC_NONE
 #define FLASH_SLOT_WRITE     7500
@@ -170,11 +172,17 @@ static int flash_nrf_read(const struct device *dev, off_t addr,
 	}
 #endif
 
-#if CONFIG_TRUSTED_EXECUTION_NONSECURE && USE_PARTITION_MANAGER && PM_APP_ADDRESS
+#if CONFIG_TRUSTED_EXECUTION_NONSECURE
+#if USE_PARTITION_MANAGER && PM_APP_ADDRESS
 	if (addr < PM_APP_ADDRESS) {
 		return soc_secure_mem_read(data, (void *)addr, len);
 	}
+#elif !USE_PARTITION_MANAGER && DT_NODE_EXISTS(DT_NODELABEL(slot0_ns_partition))
+	if ((uintptr_t)addr < DT_REG_ADDR(DT_NODELABEL(slot0_ns_partition))) {
+		return soc_secure_mem_read(data, (void *)addr, len);
+	}
 #endif
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
 
 	nrf_nvmc_buffer_read(data, (uint32_t)addr, len);