nrf_security: tf-m: Move Kconfig default overides earlier

Move Kconfig default overides earlier so they stay infront of
nrf_security.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

Kconfig.nrf

@@ -13,6 +13,19 @@ orsource "./$(BOARD_DIR)/Kconfig"
 rsource "boards/shields/*/Kconfig.shield"
 rsource "subsys/net/openthread/Kconfig.defconfig"
 
+if !TFM_PROFILE_TYPE_MINIMAL
+rsource "modules/trusted-firmware-m/Kconfig.mbedtls.defconfig"
+endif # ! TFM_PROFILE_TYPE_MINIMAL
+
+if TFM_PROFILE_TYPE_MINIMAL
+rsource "modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig"
+rsource "modules/trusted-firmware-m/Kconfig.tfm_minimal.defconfig"
+endif # TFM_PROFILE_TYPE_MINIMAL
+
+if BUILD_WITH_TFM
+rsource "modules/trusted-firmware-m/Kconfig.psa.defconfig"
+endif # BUILD_WITH_TFM
+
 menu "Nordic nRF Connect"
 
 # Override configuration from zephyr which sets this to 0x200 if MCUboot is

modules/trusted-firmware-m/Kconfig

@@ -344,18 +344,11 @@ endif # BUILD_WITH_TFM
 source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm"
 
 if !TFM_PROFILE_TYPE_MINIMAL
-rsource "Kconfig.mbedtls.defconfig"
-
 # When enabling full TFM support, then partitions and crypto modules shall be available.
 source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.partitions"
 source "$(ZEPHYR_BASE)/modules/trusted-firmware-m/Kconfig.tfm.crypto_modules"
 endif
 
-if TFM_PROFILE_TYPE_MINIMAL
-rsource "Kconfig.mbedtls_minimal.defconfig"
-rsource "Kconfig.tfm_minimal.defconfig"
-endif # TFM_PROFILE_TYPE_MINIMAL
-
 if BUILD_WITH_TFM
 
 config PM_PARTITION_SIZE_TFM_SRAM
@@ -429,6 +422,4 @@ config TFM_NRF_PROVISIONING
 	  provisioning lifecycle state in order to boot. See provisioning
 	  guide for more details.
 
-rsource "Kconfig.psa.defconfig"
-
 endif # BUILD_WITH_TFM