diff --git a/src/mainboard/facebook/watson/Kconfig b/src/mainboard/facebook/watson/Kconfig
index 3235b6cc99..4a9d3ef4f5 100644
--- a/src/mainboard/facebook/watson/Kconfig
+++ b/src/mainboard/facebook/watson/Kconfig
@@ -10,7 +10,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SERIRQ_CONTINUOUS_MODE
 	select MAINBOARD_USES_IFD_GBE_REGION
 	select MAINBOARD_HAS_LPC_TPM
-	select MAINBOARD_HAS_TPM1
+	select MAINBOARD_HAS_TPM1 if BOARD_FACEBOOK_WATSON
 	select NO_UART_ON_SUPERIO
 
 config VBOOT
@@ -54,4 +54,4 @@ config ENABLE_TURBO
 	bool "Enable turbo frequency"
 	default n
 
-endif # BOARD_FACEBOOK_WATSON
+endif # BOARD_FACEBOOK_WATSON*
diff --git a/src/mainboard/facebook/watson/Kconfig.name b/src/mainboard/facebook/watson/Kconfig.name
index ea6c344791..1a66168e66 100644
--- a/src/mainboard/facebook/watson/Kconfig.name
+++ b/src/mainboard/facebook/watson/Kconfig.name
@@ -1,2 +1,2 @@
 config BOARD_FACEBOOK_WATSON
-	bool "Watson"
+	bool "Watson_v1"