modules: tf-m: Remove some download Kconfigs

Removes two Kconfig which seemed to indicate downloading of a
project would happen automatically, which does not abide by how
to get additional module code in Zephyr. Due to TF-M always setting
these to "DOWNLOAD" in the repo, they are set even if the modules
do not exist so that they do not download e.g. in CI. Unfortunately
it seems that the qcbor one cannot be removed at this time due to
being needed in some applications and is not apache licensed,
though instructions should be provided to users instead describing
how to add it to a module manifest instead, in a later task

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

modules/trusted-firmware-m/CMakeLists.txt

@@ -67,6 +67,8 @@ if (CONFIG_BUILD_WITH_TFM)
       list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_KEY_${SUFFIX}=${CONFIG_TFM_KEY_FILE_${SUFFIX}})
     endforeach()
 
+    # Supply path to MCUboot for TF-M build
+    list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_PATH=${ZEPHYR_MCUBOOT_MODULE_DIR})
   else()
     list(APPEND TFM_CMAKE_ARGS -DBL2=FALSE)
   endif()
@@ -256,11 +258,6 @@ if (CONFIG_BUILD_WITH_TFM)
     list(APPEND TFM_CMAKE_ARGS -DHAL_ADI_PATH=${ZEPHYR_ADI_MODULE_DIR})
   endif()
 
-  if(CONFIG_TFM_BL2 AND CONFIG_TFM_MCUBOOT_PATH_LOCAL)
-    # Supply path to MCUboot for TF-M build
-    list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_PATH=${ZEPHYR_MCUBOOT_MODULE_DIR})
-  endif()
-
   if(CONFIG_TFM_MCUBOOT_DATA_SHARING)
     list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_DATA_SHARING=ON)
   endif()
@@ -277,8 +274,8 @@ if (CONFIG_BUILD_WITH_TFM)
 
   list(APPEND TFM_CMAKE_ARGS -DTFM_TESTS_REVISION_CHECKS=OFF)
 
-  if(CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL)
-    list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${CONFIG_TFM_ETHOS_DRIVER_PATH_LOCAL})
+  if(CONFIG_SOC_SERIES_MPS3 OR CONFIG_SOC_SERIES_MPS4)
+    list(APPEND TFM_CMAKE_ARGS -DETHOS_DRIVER_PATH=${ZEPHYR_HAL_ETHOS_U_MODULE_DIR})
   endif()
 
   if(CONFIG_TFM_STM32_FLASH_LAYOUT_BEGIN_OFFSET)

modules/trusted-firmware-m/Kconfig.tfm

@@ -310,43 +310,6 @@ config TFM_MCUBOOT_IMAGE_NUMBER
 	  updated in one atomic operation. When this is 2, they are split and
 	  can be updated independently if dependency requirements are met.
 
-choice TFM_MCUBOOT_PATH
-	prompt "Path to MCUboot or DOWNLOAD to fetch automatically"
-	default TFM_MCUBOOT_PATH_LOCAL
-	help
-	   Path to MCUboot for TF-M builds. The default option
-	   is to use Zephyr's MCUboot module. As an alternative,
-	   users may switch to the 'download' version; in that
-	   case MCUboot will be fetched by the TF-M build during
-	   build time. The default option ensures that Zephyr builds
-	   with TF-M do not fetch external trees.
-
-config TFM_MCUBOOT_PATH_LOCAL
-	bool "TF-M to use Zephyr's MCUboot"
-	help
-	  TF-M builds with BL2 will use the Zephyr's MCUboot version,
-	  which is present in the MCUboot module.
-
-config TFM_MCUBOOT_PATH_DOWNLOAD
-	bool "TF-M to automatically download MCUboot during build"
-	help
-	  TF-M builds with BL2 will let the TF-M build to automatically
-	  fetch and check-out the MCUboot version to use in the build.
-
-endchoice
-
-config TFM_ETHOS_DRIVER_PATH_LOCAL
-	string "Path to a locally available Ethos-U driver or an empty string"
-	depends on SOC_SERIES_MPS3 || SOC_SERIES_MPS4
-	default "$(ZEPHYR_HAL_ETHOS_U_MODULE_DIR)"
-	help
-	  Path to a locally available Ethos-U driver to be used for TF-M builds or
-	  an empty string to allow TF-M to automatically fetch the Ethos-U
-	  driver from an external repository at build time.
-	  By default Zephyr's Ethos-U driver will be used. It is present in
-	  the hal_ethos_u module.
-	  Alternatively, applications can point to their own paths for Ethos-U driver.
-
 config TFM_QCBOR_PATH
 	string
 	prompt "Path to QCBOR or DOWNLOAD to fetch automatically"