diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index bb27da02e9..6177285a79 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -76,7 +76,7 @@ config CPU_MICROCODE_IN_CBFS
 	default n
 
 choice
-	prompt "Include CPU microcode in CBFS"
+	prompt "Include CPU microcode in CBFS" if ARCH_X86
 	default CPU_MICROCODE_CBFS_GENERATE if CPU_MICROCODE_IN_CBFS
 	default CPU_MICROCODE_CBFS_NONE if !CPU_MICROCODE_IN_CBFS
 
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index e1efecc7f5..b48a803795 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -11,21 +11,21 @@ subdirs-y += via
 ## Rules for building the microcode blob in CBFS
 ################################################################################
 
-ifneq ($(CONFIG_CPU_MICROCODE_CBFS_NONE), y)
-
-cbfs-files-y += cpu_microcode_blob.bin
-
-cpu_microcode_blob.bin-type = 0x53
-
 # External microcode file, or are we generating one ?
 ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y)
+cbfs-files-y += cpu_microcode_blob.bin
+cpu_microcode_blob.bin-type = 0x53
 cpu_microcode_blob.bin-file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE))
-else
+endif
+
+ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE), y)
+cbfs-files-y += cpu_microcode_blob.bin
+cpu_microcode_blob.bin-type = 0x53
 cpu_microcode_blob.bin-file = $(obj)/cpu_microcode_blob.bin
 endif
 
 # In case we have more than one "source" (cough) files containing microcode, we
-# Link them together in one large blob, so that we get all the microcode updates
+# link them together in one large blob, so that we get all the microcode updates
 # in one file. This makes it easier for objcopy in the final step.
 # The --entry=0 is just here to suppress the LD warning. It does not affect the
 # final microcode file.
@@ -38,5 +38,3 @@ $(obj)/cpu_microcode_blob.o: $$(cpu_microcode-objs)
 $(obj)/cpu_microcode_blob.bin: $(obj)/cpu_microcode_blob.o
 	@printf "  MICROCODE    $(subst $(obj)/,,$(@))\n"
 	$(OBJCOPY) -j .data -O binary $< $@
-
-endif