summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPark, Aiden <aiden.park@intel.com>2019-08-03 08:31:20 +0000
committerBin Meng <bmeng.cn@gmail.com>2019-08-09 22:24:02 +0800
commitdbaec467671fd5b56cf380121340844863f5472d (patch)
tree76a67ce818240d1efbb1f0700663b3958766fbb8
parentd8f6db4768bc8516cf346546435588427a06e46b (diff)
downloadu-boot-dbaec467671fd5b56cf380121340844863f5472d.tar.gz
x86: Skip setting up MTRRs in slimbootloader
The setting up MTRRs have already been done in previous Slim Bootloader stages. Signed-off-by: Aiden Park <aiden.park@intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--arch/x86/lib/init_helpers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 0481f453ca..5e19f13720 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -18,7 +18,8 @@ __weak ulong board_get_usable_ram_top(ulong total_size)
int init_cache_f_r(void)
{
-#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP)
+#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) && \
+ !defined(CONFIG_SYS_SLIMBOOTLOADER)
int ret;
ret = mtrr_commit(false);