diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-05 11:29:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-05 11:29:57 -0400 |
| commit | 90eba245a66aa20589404ba537215faf2012c1a3 (patch) | |
| tree | c581cd1f00dd162aeac4262bb4e74c2a9fea98c9 /arch/x86/lib/init_helpers.c | |
| parent | b46dd116ce03e235f2a7d4843c6278e1da44b5e1 (diff) | |
| parent | db8b46120aed6554d1ff405260ea6d2cc2439fcc (diff) | |
Merge branch 'next'
Diffstat (limited to 'arch/x86/lib/init_helpers.c')
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 066dc404a2d..67401b9ba79 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -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(); } |