|
@@ -18,10 +18,20 @@ 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) &&
|
|
|
+ /*
|
|
|
+ * Supported configurations:
|
|
|
+ *
|
|
|
+ * booting from slimbootloader - in that case the MTRRs are already set
|
|
|
+ * up
|
|
|
+ * booting with FSPv1 - MTRRs are already set up
|
|
|
+ * booting with FSPv2 - 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_SPL) &&
|
|
|
+ !IS_ENABLED(CONFIG_FSP_VERSION1) &&
|
|
|
!IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);
|
|
|
|
|
|
if (do_mtrr) {
|