x86: Revert "Don't set up MTRRs in SPL"
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 18 Jun 2019 16:06:34 +0000 (19:06 +0300)
committerBin Meng <bmeng.cn@gmail.com>
Sat, 22 Jun 2019 14:26:22 +0000 (22:26 +0800)
This breaks Intel Edison to work. It gets laggish and unable to boot kernel.

Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now
till better solution will be proposed.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/lib/init_helpers.c

index ac85278cdf0d705c1c7aa751339d7799ad49c3ab..0481f453ca62571d183ece437340584de78f3c59 100644 (file)
@@ -18,10 +18,7 @@ __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_SPL_BUILD) && \
-      !CONFIG_IS_ENABLED(CONFIG_X86_RUN_64BIT))) && \
-    !defined(CONFIG_HAVE_FSP)
+#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP)
        int ret;
 
        ret = mtrr_commit(false);