diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-08 09:20:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-08 09:20:19 -0400 |
| commit | 8c66fb88e3bd00b486d2da2b90f5ff8534b7e3c0 (patch) | |
| tree | 4b8a83298e5db7f930fd76f1cb7c0b40c0fbaf10 /arch/x86/cpu/Makefile | |
| parent | d4c352138c266d618677778a40a846946ec1af1c (diff) | |
| parent | ffe403762be48d475de4b2b6df87c32fd3a1e8dd (diff) | |
Merge git://git.denx.de/u-boot-x86
- Allow x86 boards to use TPL, SPL and U-Boot proper
- Update sysreset x86 driver to utilize ACPI registers to do power off
- Add a new chromebook_samus_tpl board for TPL support
- Several minor changes in binman tool
Diffstat (limited to 'arch/x86/cpu/Makefile')
| -rw-r--r-- | arch/x86/cpu/Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 54668aab24..85fd5e616e 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -9,9 +9,22 @@ ifeq ($(CONFIG_$(SPL_)X86_64),y) extra-y = start64.o else +ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y) extra-y = start.o +else +ifndef CONFIG_SPL +extra-y = start.o +else +ifdef CONFIG_SPL_BUILD +extra-y = start_from_tpl.o +else +extra-y = start_from_spl.o endif -extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o +endif +endif +endif + +extra-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += resetvec.o start16.o obj-y += cpu.o cpu_x86.o |