x86: Move commands from under arch/x86 to cmd/x86/

We only need to compile and link these files when building for full
U-Boot.  Move them to under cmd/x86/ to make sure they aren't linked in
and undiscarded due to u_boot_list_2_cmd_* being included).

Cc: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 7d729ea0f7dcdea69b5e268a7be45bd31bbddd3f..f6be13fe9492ae32d30426c7413169c2e0760090 100644 (file)
--- 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 afe83dd32437ed7072a19433853b2d053061e8ba..c7a248f7f2e7f8afc1ad223dcf3f99e613c29518 100644 (file)
--- 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 00e38696daaf6a230a28f5bb8e01daa12ed90694..ab45bf434a96199fa56dd2d581c2e1594c05d9f5 100644 (file)
--- 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 (file)
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