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 --- Changes in v2: - Format patch with -M - Drop 'cmd_' from the new file name (and checked file content for now erroneous cmd in comments, none found).

arch/x86/lib/Makefile | 1 - arch/x86/lib/fsp/Makefile | 1 - cmd/Makefile | 2 ++ cmd/x86/Makefile | 6 ++++++ arch/x86/lib/fsp/cmd_fsp.c => cmd/x86/fsp.c | 0 arch/x86/lib/cmd_mtrr.c => cmd/x86/mtrr.c | 0 6 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 cmd/x86/Makefile rename arch/x86/lib/fsp/cmd_fsp.c => cmd/x86/fsp.c (100%) rename arch/x86/lib/cmd_mtrr.c => cmd/x86/mtrr.c (100%)

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 7d729ea0f7dc..f6be13fe9492 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 afe83dd32437..c7a248f7f2e7 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 00e38696daaf..ab45bf434a96 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 000000000000..d4c690b0551d --- /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