diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-03 08:54:27 -0500 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2018-01-08 16:52:22 +0800 |
| commit | 8e18f34c28cad949710ffb781316bd2540b64de7 (patch) | |
| tree | 7923f68abc02c999ad5a14d4c283ad7224ce1aa2 | |
| parent | ca833ca9579b29c5667ea2fa7a9d3f89f1599a94 (diff) | |
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>
| -rw-r--r-- | arch/x86/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/Makefile | 1 | ||||
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | cmd/x86/Makefile | 6 | ||||
| -rw-r--r-- | cmd/x86/fsp.c (renamed from arch/x86/lib/fsp/cmd_fsp.c) | 0 | ||||
| -rw-r--r-- | cmd/x86/mtrr.c (renamed from arch/x86/lib/cmd_mtrr.c) | 0 |
6 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 7d729ea0f7..f6be13fe94 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 afe83dd324..c7a248f7f2 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 00e38696da..ab45bf434a 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 0000000000..d4c690b055 --- /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 index 2a99cfe0d0..2a99cfe0d0 100644 --- a/arch/x86/lib/fsp/cmd_fsp.c +++ b/cmd/x86/fsp.c diff --git a/arch/x86/lib/cmd_mtrr.c b/cmd/x86/mtrr.c index f632f495ed..f632f495ed 100644 --- a/arch/x86/lib/cmd_mtrr.c +++ b/cmd/x86/mtrr.c |