diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 7d729ea..f6be13f 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -23,7 +23,6 @@ obj-y	+= interrupts.o
 obj-y	+= lpc-uclass.o
 obj-y	+= mpspec.o
 obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o
-obj-y += cmd_mtrr.o
 obj-y	+= northbridge-uclass.o
 obj-$(CONFIG_I8259_PIC) += i8259.o
 obj-$(CONFIG_I8254_TIMER) += i8254.o
diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile
index afe83dd3..c7a248f 100644
--- a/arch/x86/lib/fsp/Makefile
+++ b/arch/x86/lib/fsp/Makefile
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y += cmd_fsp.o
 obj-y += fsp_car.o
 obj-y += fsp_common.o
 obj-y += fsp_dram.o
diff --git a/cmd/Makefile b/cmd/Makefile
index 00e3869..ab45bf4 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -150,6 +150,8 @@ obj-$(CONFIG_CMD_PMIC) += pmic.o
 obj-$(CONFIG_CMD_REGULATOR) += regulator.o
 
 obj-$(CONFIG_CMD_BLOB) += blob.o
+
+obj-$(CONFIG_X86) += x86/
 endif # !CONFIG_SPL_BUILD
 
 # core command
diff --git a/cmd/x86/Makefile b/cmd/x86/Makefile
new file mode 100644
index 0000000..d4c690b
--- /dev/null
+++ b/cmd/x86/Makefile
@@ -0,0 +1,6 @@
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += mtrr.o
+obj-$(CONFIG_HAVE_FSP) += fsp.o
diff --git a/arch/x86/lib/fsp/cmd_fsp.c b/cmd/x86/fsp.c
similarity index 100%
rename from arch/x86/lib/fsp/cmd_fsp.c
rename to cmd/x86/fsp.c
diff --git a/arch/x86/lib/cmd_mtrr.c b/cmd/x86/mtrr.c
similarity index 100%
rename from arch/x86/lib/cmd_mtrr.c
rename to cmd/x86/mtrr.c