diff --git a/include/config.h b/include/config.h
index e44a97e96c..54760d245e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -763,6 +763,7 @@
 #endif
 
 #ifndef HAS_TASK_CHIPSET
+#undef CONFIG_CHIPSET_BAYTRAIL
 #undef CONFIG_CHIPSET_GAIA
 #undef CONFIG_CHIPSET_HASWELL
 #undef CONFIG_CHIPSET_IVYBRIDGE