diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:03:45 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | 972188b3a88261969dad0c972b5b915999756d0b (patch) | |
| tree | 3a13ec8edb2a617b5170d9821cf553e4d775e9b2 /arch/x86/Makefile | |
| parent | 13f1dc64fd09d2894d13ca0db08ddd168bc12387 (diff) | |
| download | u-boot-972188b3a88261969dad0c972b5b915999756d0b.tar.gz u-boot-972188b3a88261969dad0c972b5b915999756d0b.tar.bz2 u-boot-972188b3a88261969dad0c972b5b915999756d0b.zip | |
x86: Use X86_16BIT_INIT instead of X86_RESET_VECTOR
Use this new option to control the location of 16-bit init. This will allow
us to place this in SPL if needed.
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index d104a49730..dd0e22f970 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -5,10 +5,8 @@ ifeq ($(CONFIG_EFI_APP),) head-y := arch/x86/cpu/start.o endif -ifeq ($(CONFIG_SPL_BUILD),y) -head-y += arch/x86/cpu/start16.o -head-y += arch/x86/cpu/resetvec.o -endif +head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o +head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o libs-y += arch/x86/cpu/ libs-y += arch/x86/lib/ |