diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig
index 8a51abd496..cbab6a7f7c 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -458,4 +458,16 @@ config SOC_PHYSICAL_ADDRESS_WIDTH
 	int
 	default 42
 
+config SKIP_SEND_CONNECT_TOPOLOGY_CMD
+	bool
+	default y if SOFTWARE_CONNECTION_MANAGER
+	default n
+	help
+	  When selected, the FSP UPD ITbtConnectTopologyTimeoutInMs will be set to
+	  zero, causing FSP to skip sending the Connect Topology (CNTP) command,
+	  which by default has a 5s timeout. CNTP is not needed when using software
+	  connection manager, and sending it will cause a 5-10s boot delay.
+	  Mainboards which use firmware connection manager may also wish to select this
+	  as needed.
+
 endif
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c
index 30ea478432..8c3ceb75cc 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -396,6 +396,13 @@ static void fill_fsps_tcss_params(FSP_S_CONFIG *s_cfg,
 	/* Explicitly clear this field to avoid using defaults */
 	memset(s_cfg->IomTypeCPortPadCfg, 0, sizeof(s_cfg->IomTypeCPortPadCfg));
 
+	/*
+	 * Set ITbtConnectTopologyTimeoutInMs to 0 if config selected,
+	 * in order to skip sending the connect toplogy (CNTP) command.
+	 */
+	if (CONFIG(SKIP_SEND_CONNECT_TOPOLOGY_CMD))
+		s_cfg->ITbtConnectTopologyTimeoutInMs = 0;
+
 	/* D3Hot and D3Cold for TCSS */
 	s_cfg->D3HotEnable = !config->tcss_d3_hot_disable;
 	s_cfg->D3ColdEnable = CONFIG(D3COLD_SUPPORT);