diff options
| author | Simon Glass | 2019-04-25 21:58:52 -0600 |
|---|---|---|
| committer | Bin Meng | 2019-05-08 13:02:13 +0800 |
| commit | 051c31b7a49933f25bcf2ffe8c7764642fcff0d4 (patch) | |
| tree | 06a8696d480ed074a7a46718c7a65b73f1206d82 /arch/x86/Makefile | |
| parent | 9231206b73a3eee6e68e4dd708abdb4e625eac71 (diff) | |
x86: Add support for starting from SPL/TPL
When a previous phase of U-Boot has run we need to adjust the init of
subsequent states to avoid messing up the CPU state.
Add a new version of the start logic for SPL, when it boots from TPL
(start_from tpl.c) and a new version for U-Boot when it boots from SPL.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index fec14847cc5..9fd6cf2d3bb 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -4,9 +4,21 @@ ifeq ($(CONFIG_EFI_APP),) ifdef CONFIG_$(SPL_)X86_64 head-y := arch/x86/cpu/start64.o else +ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y) head-y := arch/x86/cpu/start.o +else +ifndef CONFIG_SPL +head-y := arch/x86/cpu/start.o +else +ifdef CONFIG_SPL_BUILD +head-y = arch/x86/cpu/start_from_tpl.o +else +head-y = arch/x86/cpu/start_from_spl.o +endif +endif endif endif +endif # EFI head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o |