diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index 4fe5434c72..20e2230da5 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -39,6 +39,7 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
 	const struct pad_config *c = NULL;
 	switch (board_id()) {
 	case 0:
+	case 1:
 	case UNDEFINED_STRAPPING_ID:
 		*num = 0;
 		break;
@@ -81,11 +82,11 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
 {
 	/*
 	 * This is a hack to configure EN_PP3300_WLAN based on board id. Once
-	 * board id 0 is deprecated, we can get rid of this.
+	 * board id 0/1 is deprecated, we can get rid of this.
 	 */
 	uint32_t bid = board_id();
 
-	if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
+	if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
 		gpio_output(GPIO_178, 1);
 	else
 		gpio_output(GPIO_178, 0);
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index 1ead5e230c..07545dc2d9 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -38,7 +38,7 @@ void variant_update_devtree(struct device *dev)
 	bid = board_id();
 
 	/* Nothing to update. */
-	if (bid == UNDEFINED_STRAPPING_ID || bid < 1)
+	if (bid == UNDEFINED_STRAPPING_ID || bid < 2)
 		return;
 
 	touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7);