diff --git a/src/Kconfig b/src/Kconfig
index f94fad4144..7c325c292b 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1114,22 +1114,23 @@ config DEBUG_COVERAGE
 	  If enabled, the code coverage hooks in coreboot will output some
 	  information about the coverage data that is dumped.
 
+config GENERIC_GPIO_LIB
+	bool "Build generic GPIO library"
+	default n
+	help
+	  If enabled, compile the generic GPIO library. A "generic" GPIO
+	  implies configurability usually found on SoCs, particularly the
+	  ability to control internal pull resistors.
+
 config BOARD_ID_SUPPORT
 	bool "Discover board ID and store it in coreboot table"
 	default n
+	select GENERIC_GPIO_LIB
 	help
 	  If enabled, coreboot discovers the board id of the hardware it is
 	  running on and reports it through the coreboot table to the rest of
 	  the system.
 
-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)
-
 endmenu
 
 # These probably belong somewhere else, but they are needed somewhere.
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 0959359695..54e0473766 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -92,7 +92,7 @@ ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c
 ramstage-y += memrange.c
 ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
 ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
-ramstage-$(CONFIG_TERTIARY_BOARD_ID) += gpio.c
+ramstage-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c
 ramstage-$(CONFIG_GENERIC_UDELAY) += timer.c
 
 romstage-y += cbmem_common.c dynamic_cbmem.c
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 7334472e41..22958a953c 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -34,7 +34,6 @@ 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 34959199b3..0902b4f236 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -34,7 +34,6 @@ 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_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index a824f2e7e9..da517dab39 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -31,7 +31,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select BOARD_ROMSIZE_KB_4096
 	select VIRTUAL_DEV_SWITCH
-	select TERTIARY_BOARD_ID
 	select ARCH_SPINTABLE
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 3e1e0168bb..5e010fc331 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS
 	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"