x86: coreboot: Don't setup MTRR when booting from coreboot
authorSimon Glass <sjg@chromium.org>
Mon, 15 Mar 2021 05:00:34 +0000 (18:00 +1300)
committerSimon Glass <sjg@chromium.org>
Sat, 27 Mar 2021 02:04:31 +0000 (15:04 +1300)
This currently hangs and it is not necessary in any case. Drop the code
when booting from coreboot.

Signed-off-by: Simon Glass <sjg@chromium.org>
arch/x86/lib/init_helpers.c

index 066dc40..67401b9 100644 (file)
@@ -18,6 +18,9 @@ int init_cache_f_r(void)
                 IS_ENABLED(CONFIG_FSP_VERSION2);
        int ret;
 
+       if (!ll_boot_init())
+               return 0;
+
        do_mtrr &= !IS_ENABLED(CONFIG_FSP_VERSION1) &&
                !IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);
 
@@ -31,9 +34,6 @@ int init_cache_f_r(void)
                        return ret;
        }
 
-       if (!ll_boot_init())
-               return 0;
-
        /* Initialise the CPU cache(s) */
        return init_cache();
 }