diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index b0f7a140ab..9ab0556da3 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -159,16 +159,3 @@ config CPU_MICROCODE_FILE
 	  default "cpu_microcode.bin"
 	  help
 	    The path and filename of the file containing the CPU microcode.
-
-config CPU_MICROCODE_CBFS_LOC
-	  hex "Microcode address in CBFS"
-	  depends on CPU_MICROCODE_IN_CBFS
-	  default 0
-
-config CPU_MICROCODE_CBFS_LEN
-	  hex "Microcode length in CBFS"
-	  depends on CPU_MICROCODE_IN_CBFS
-	  default 0xC000
-	  help
-		The microcode needs a specific length to get correctly
-		detected and loaded by all CPUs.
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index 60864ef5dd..2411aebeb4 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -29,7 +29,7 @@ cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
 cbfs_include_ucode = y
 endif
 
-ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC), 0)
+ifeq ($(CONFIG_PLATFORM_USES_FSP), y)
 cpu_ucode_cbfs_offset = "-b $(CONFIG_CPU_MICROCODE_CBFS_LOC)"
 else
 cpu_ucode_cbfs_offset = "-b"