diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 9bd57a353e..6a86576c2b 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -39,7 +39,6 @@ config SOC_INTEL_WHISKEYLAKE
 config SOC_INTEL_COMETLAKE
 	bool
 	select SOC_INTEL_CANNONLAKE_BASE
-	select MICROCODE_BLOB_UNDISCLOSED
 	select FSP_USES_CB_STACK
 	select HAVE_INTEL_FSP_REPO
 	help
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc
index c744e9953d..e0605817ae 100644
--- a/src/soc/intel/cannonlake/Makefile.inc
+++ b/src/soc/intel/cannonlake/Makefile.inc
@@ -108,7 +108,11 @@ else ifeq ($(CONFIG_SOC_INTEL_WHISKEYLAKE),y)
 cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-8e-0b
 cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-8e-0c
 else ifeq ($(CONFIG_SOC_INTEL_COMETLAKE),y)
-# TODO
+ifneq ($(CONFIG_SOC_INTEL_CANNONLAKE_PCH_H),y)
+# Missing 06-a6-01
+cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-8e-0c
+cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-a6-00
+endif
 endif
 
 CPPFLAGS_common += -I$(src)/soc/intel/cannonlake