diff --git a/common/Kconfig b/common/Kconfig
index dcab69d3215..d5bc37e4c7b 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -601,4 +601,25 @@ config HASH
 
 endmenu
 
+menu "Update support"
+
+config UPDATE_TFTP
+	bool "Auto-update using fitImage via TFTP"
+	depends on FIT
+	help
+	  This option allows performing update of NOR with data in fitImage
+	  sent via TFTP boot.
+
+config UPDATE_TFTP_CNT_MAX
+	int "The number of connection retries during auto-update"
+	default 0
+	depends on UPDATE_TFTP
+
+config UPDATE_TFTP_MSEC_MAX
+	int "Delay in mSec to wait for the TFTP server during auto-update"
+	default 100
+	depends on UPDATE_TFTP
+
+endmenu
+
 source "common/spl/Kconfig"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1be3f234326..e5b6831633d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4740,9 +4740,6 @@ CONFIG_ULPI_REF_CLK
 CONFIG_UMSDEVS
 CONFIG_UPDATEB
 CONFIG_UPDATE_LOAD_ADDR
-CONFIG_UPDATE_TFTP
-CONFIG_UPDATE_TFTP_CNT_MAX
-CONFIG_UPDATE_TFTP_MSEC_MAX
 CONFIG_USART1
 CONFIG_USART_BASE
 CONFIG_USART_ID