kconfig: tfm: move UART-related pin config entries

lemrey · rlubos · commit 72d7950ae463 · 2022-09-09T10:23:11.000+02:00
Move them out of the top-level KConfig menu to clean it up a bit.

Signed-off-by: Emanuele Di Santo &lt;emdi@nordicsemi.no&gt;
diff --git a/modules/tfm/zephyr/Kconfig b/modules/tfm/zephyr/Kconfig
@@ -12,79 +12,3 @@ config TFM_BOARD
 	help
 	  Redefinition of TFM_BOARD to use out-of-tree boards. These depend on
 	  ${TFM_BOARD_BASE_DIR} being set to the TFM board dir inside sdk-nrf.
-
-if BUILD_WITH_TFM
-
-config TFM_SECURE_UART1
-	bool
-	select NRF_UARTE1_SECURE
-
-config TFM_UART0_TXD_PIN
-	int "UART0 TXD pin"
-	default 29 if BOARD_NRF9160DK_NRF9160_NS
-	default 20 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART0 TXD pin.
-	  UART0 is used by TF-M as the log output for the non-secure image.
-
-	  Note: The non-secure image is only ever used when running the
-	        TF-M regression tests.
-
-config TFM_UART0_RXD_PIN
-	int "UART0 RXD pin"
-	default 28 if BOARD_NRF9160DK_NRF9160_NS
-	default 22 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART0 RXD pin.
-	  UART0 is used by TF-M as the log output for the non-secure image.
-
-	  Note: The non-secure image is only ever used when running the
-	        TF-M regression tests.
-
-config TFM_UART0_RTS_PIN
-	int "UART0 RTS pin"
-	default 27 if BOARD_NRF9160DK_NRF9160_NS
-	default 19 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART0 RTS pin.
-	  UART0 is used by TF-M as the log output for the non-secure image.
-
-	  Note: The non-secure image is only ever used when running the
-	        TF-M regression tests.
-
-config TFM_UART0_CTS_PIN
-	int "UART0 CTS pin"
-	default 26 if BOARD_NRF9160DK_NRF9160_NS
-	default 21 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART0 CTS pin.
-	  UART0 is used by TF-M as the log output for the non-secure image.
-
-	  Note: The non-secure image is only ever used when running the
-	        TF-M regression tests.
-
-config TFM_UART1_TXD_PIN
-	int "UART1 TXD pin"
-	depends on TFM_SECURE_UART1
-	default 1 if BOARD_NRF9160DK_NRF9160_NS
-	default 25 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART1 TXD pin.
-	  UART1 is used by TF-M as the log output for the secure image.
-
-config TFM_UART1_RXD_PIN
-	int "UART1 RXD pin"
-	depends on TFM_SECURE_UART1
-	default 0 if BOARD_NRF9160DK_NRF9160_NS
-	default 26 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	default 4294967295 # 0xffffffff i.e. disconnected
-	help
-	  The GPIO pin the TFM build system will use for UART1 RXD pin.
-	  UART1 is used by TF-M as the log output for the secure image.
-
-endif # BUILD_WITH_TFM
diff --git a/subsys/nonsecure/Kconfig b/subsys/nonsecure/Kconfig
@@ -7,6 +7,83 @@
 if BUILD_WITH_TFM || IS_SPM
 menu "Trusted Execution Non-Secure"
 
+menu "TF-M UART pins"
+	visible if BUILD_WITH_TFM
+
+config TFM_SECURE_UART1
+	bool
+	select NRF_UARTE1_SECURE
+
+config TFM_UART0_TXD_PIN
+	int "UART0 TXD pin"
+	default 29 if BOARD_NRF9160DK_NRF9160_NS
+	default 20 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART0 TXD pin.
+	  UART0 is used by TF-M as the log output for the non-secure image.
+
+	  Note: The non-secure image is only ever used when running the
+	        TF-M regression tests.
+
+config TFM_UART0_RXD_PIN
+	int "UART0 RXD pin"
+	default 28 if BOARD_NRF9160DK_NRF9160_NS
+	default 22 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART0 RXD pin.
+	  UART0 is used by TF-M as the log output for the non-secure image.
+
+	  Note: The non-secure image is only ever used when running the
+	        TF-M regression tests.
+
+config TFM_UART0_RTS_PIN
+	int "UART0 RTS pin"
+	default 27 if BOARD_NRF9160DK_NRF9160_NS
+	default 19 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART0 RTS pin.
+	  UART0 is used by TF-M as the log output for the non-secure image.
+
+	  Note: The non-secure image is only ever used when running the
+	        TF-M regression tests.
+
+config TFM_UART0_CTS_PIN
+	int "UART0 CTS pin"
+	default 26 if BOARD_NRF9160DK_NRF9160_NS
+	default 21 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART0 CTS pin.
+	  UART0 is used by TF-M as the log output for the non-secure image.
+
+	  Note: The non-secure image is only ever used when running the
+	        TF-M regression tests.
+
+config TFM_UART1_TXD_PIN
+	int "UART1 TXD pin"
+	depends on TFM_SECURE_UART1
+	default 1 if BOARD_NRF9160DK_NRF9160_NS
+	default 25 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART1 TXD pin.
+	  UART1 is used by TF-M as the log output for the secure image.
+
+config TFM_UART1_RXD_PIN
+	int "UART1 RXD pin"
+	depends on TFM_SECURE_UART1
+	default 0 if BOARD_NRF9160DK_NRF9160_NS
+	default 26 if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	default 4294967295 # 0xffffffff i.e. disconnected
+	help
+	  The GPIO pin the TFM build system will use for UART1 RXD pin.
+	  UART1 is used by TF-M as the log output for the secure image.
+
+endmenu
+
 menu "Peripheral Secure mapping"
 
 rsource "${ZEPHYR_BASE}/modules/hal_nordic/Kconfig.dt"
