diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c
index 0e6c7b98c6..30b46fb771 100644
--- a/src/mainboard/google/poppy/mainboard.c
+++ b/src/mainboard/google/poppy/mainboard.c
@@ -60,7 +60,18 @@ static void mainboard_chip_init(void *chip_info)
 	gpio_configure_pads(pads, num);
 }
 
+void __weak variant_final(void)
+{
+	/* nop */
+}
+
+static void mainboard_final(void *chip_info)
+{
+	variant_final();
+}
+
 struct chip_operations mainboard_ops = {
 	.init = mainboard_chip_init,
 	.enable_dev = mainboard_enable,
+	.final = mainboard_final
 };
diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
index 9d3e7f087f..9e4bfc5ff3 100644
--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h
@@ -55,6 +55,7 @@ int variant_memory_sku(void);
 void variant_devtree_update(void);
 uint32_t variant_board_sku(void);
 void variant_smi_sleep(u8 slp_typ);
+void variant_final(void);
 
 struct nhlt;
 void variant_nhlt_init(struct nhlt *nhlt);