Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Use X86_32BIT_INIT instead of X86_RESET_VECTOR

Browse source 
Use this new option to control the location of 32-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>
This commit is contained in:
Simon Glass 2017-01-16 07:03:46 -07:00 • committed by Bin Meng
parent 972188b3a8
commit 2eff989585
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/cpu/intel_common/Makefile
View file

@ -4,13 +4,15 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-$(CONFIG_HAVE_MRC) += car.o ifdef CONFIG_HAVE_MRC
obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += car.o
obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += me_status.o
obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += report_platform.o
obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o
endif
obj-y += cpu.o obj-y += cpu.o
obj-y += lpc.o obj-y += lpc.o
obj-$(CONFIG_HAVE_MRC) += me_status.o
ifndef CONFIG_TARGET_EFI ifndef CONFIG_TARGET_EFI
obj-y += microcode.o obj-y += microcode.o
endif endif
obj-y += pch.o obj-y += pch.o
obj-$(CONFIG_HAVE_MRC) += report_platform.o
obj-$(CONFIG_HAVE_MRC) += mrc.o

2
arch/x86/lib/init_helpers.c
View file

@ -19,7 +19,7 @@ __weak ulong board_get_usable_ram_top(ulong total_size)
int init_cache_f_r(void) int init_cache_f_r(void)
{ {
#if defined(CONFIG_X86_RESET_VECTOR) & !defined(CONFIG_HAVE_FSP) #if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP)
int ret; int ret;
ret = mtrr_commit(false); ret = mtrr_commit(false);