x86: broadwell: Set up MTRRs

The current condition does not handle the samus_tpl case where it sets
up the RAM in SPL but needs to commit the MTRRs in U-Boot proper.

Add another case to handle this and update the comment.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 60a2707dcf1b0b730a86ac797a7a7f48c8a650c5..bf0c921577d192a2aaf089c0ce9dcc9cd8a8b5d3 100644 (file)
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -15,7 +15,8 @@ DECLARE_GLOBAL_DATA_PTR;
 int init_cache_f_r(void)
 {
        bool do_mtrr = CONFIG_IS_ENABLED(X86_32BIT_INIT) ||
-                IS_ENABLED(CONFIG_FSP_VERSION2);
+                IS_ENABLED(CONFIG_FSP_VERSION2) ||
+                (IS_ENABLED(CONFIG_TPL) && IS_ENABLED(CONFIG_HAVE_MRC));
        int ret;
 
        /*
@@ -23,11 +24,9 @@ int init_cache_f_r(void)
         *
         * booting from slimbootloader - MTRRs are already set up
         * booting with FSPv1 - MTRRs are already set up
-        * booting with FSPv2 - MTRRs must be set here
+        * booting with FSPv2 or MRC - MTRRs must be set here
         * booting from coreboot - in this case there is no SPL, so we set up
         *      the MTRRs here
-        * Note: if there is an SPL, then it has already set up MTRRs so we
-        *      don't need to do that here
         */
        do_mtrr &= !IS_ENABLED(CONFIG_FSP_VERSION1) &&
                !IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);