diff --git a/src/mainboard/google/bluey/Kconfig b/src/mainboard/google/bluey/Kconfig
index 87cefb5483..f1e2648af6 100644
--- a/src/mainboard/google/bluey/Kconfig
+++ b/src/mainboard/google/bluey/Kconfig
@@ -83,10 +83,12 @@ config DRIVER_TPM_I2C_ADDR
 	default 0x50
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
+	depends on EC_GOOGLE_CHROMEEC
 	hex
 	default 0xb
 
 config MAINBOARD_GPIO_PIN_FOR_GSC_AP_INTERRUPT
+	depends on TPM_GOOGLE_TI50
 	int
 	default 34
 	help
diff --git a/src/mainboard/google/bluey/chromeos.c b/src/mainboard/google/bluey/chromeos.c
index 5dc73153b4..0f2b7da21f 100644
--- a/src/mainboard/google/bluey/chromeos.c
+++ b/src/mainboard/google/bluey/chromeos.c
@@ -7,9 +7,11 @@
 
 void setup_chromeos_gpios(void)
 {
-	gpio_input_pullup(GPIO_AP_EC_INT);
+	if (CONFIG(EC_GOOGLE_CHROMEEC))
+		gpio_input_pullup(GPIO_AP_EC_INT);
 
-	gpio_input_irq(GPIO_GSC_AP_INT, IRQ_TYPE_RISING_EDGE, GPIO_PULL_UP);
+	if (CONFIG(TPM_GOOGLE_TI50))
+		gpio_input_irq(GPIO_GSC_AP_INT, IRQ_TYPE_RISING_EDGE, GPIO_PULL_UP);
 
 	if (CONFIG(MAINBOARD_HAS_FINGERPRINT)) {
 		gpio_output(GPIO_FP_RST_L, 0);
@@ -28,10 +30,14 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 {
 	/* TODO: Add required GPIO after referring to the schematics */
 	const struct lb_gpio chromeos_gpios[] = {
+#if CONFIG(EC_GOOGLE_CHROMEEC)
 		{GPIO_AP_EC_INT.addr, ACTIVE_LOW, gpio_get(GPIO_AP_EC_INT),
 			"EC interrupt"},
+#endif
+#if CONFIG(TPM_GOOGLE_TI50)
 		{GPIO_GSC_AP_INT.addr, ACTIVE_HIGH, gpio_get(GPIO_GSC_AP_INT),
 			"TPM interrupt"},
+#endif
 		{GPIO_SNDW_AMP_0_ENABLE.addr, ACTIVE_HIGH, gpio_get(GPIO_SNDW_AMP_0_ENABLE),
 			"Speaker 0 enable"},
 		{GPIO_SNDW_AMP_1_ENABLE.addr, ACTIVE_HIGH, gpio_get(GPIO_SNDW_AMP_1_ENABLE),