6 files changed, 9 insertions, 0 deletions

diff --git a/src/Kconfig b/src/Kconfig
index 195fa809ea..7aee4781ad 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1133,6 +1133,7 @@ config BOARD_ID_SUPPORT
 config TERTIARY_BOARD_ID
 	bool "Interpret board ID GPIOs as tertiary inputs"
 	default n
+	depends on BOARD_ID_SUPPORT
 	help
 	  Consider each GPIO as being in one of three states: pulled down (0),
 	  pulled up (1), or not connected (2)
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index bee974817f..2968b0142e 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN_BIG
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select SOC_NVIDIA_TEGRA124
+	select BOARD_ID_SUPPORT
 	select MAINBOARD_HAS_CHROMEOS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_SPI
@@ -33,6 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SPI_FLASH
 	select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
 	select VIRTUAL_DEV_SWITCH
+	select TERTIARY_BOARD_ID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 10134553ae..789937ff2f 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -22,6 +22,7 @@ if BOARD_GOOGLE_NYAN_BLAZE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_ARM
+	select BOARD_ID_SUPPORT
 	select CHROMEOS
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_SPI
@@ -33,6 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_1024
 	select SPI_FLASH
 	select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
+	select TERTIARY_BOARD_ID
 	select VIRTUAL_DEV_SWITCH
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index 8c162ec661..87e742e964 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -21,6 +21,7 @@ if BOARD_GOOGLE_RUSH
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
+	select BOARD_ID_SUPPORT
 	select CHROMEOS
 	select SOC_NVIDIA_TEGRA132
 	select MAINBOARD_HAS_BOOTBLOCK_INIT
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index 0d935647cf..c489a80920 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -21,6 +21,7 @@ if BOARD_GOOGLE_RUSH_RYU
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
+	select BOARD_ID_SUPPORT
 	select SOC_NVIDIA_TEGRA132
 	select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select BOARD_ROMSIZE_KB_4096
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 10c0f1bf3e..b0c064c919 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -22,11 +22,13 @@ if BOARD_GOOGLE_STORM
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SOC_QC_IPQ806X
+	select BOARD_ID_SUPPORT
 	select BOARD_ROMSIZE_KB_4096
 	select COMMON_CBFS_SPI_WRAPPER
 	select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select SPI_FLASH
 	select SPI_FLASH_SPANSION
+	select TERTIARY_BOARD_ID
 
 config BOARD_VARIANT_AP148
 	bool "pick this to build an image for ap148"