diff options
| author | Simon Glass <sjg@chromium.org> | 2023-09-07 09:58:19 -0600 |
|---|---|---|
| committer | Bin Meng <bmeng@tinylab.org> | 2023-09-22 06:03:46 +0800 |
| commit | cd1ee5d96e05c6ce2589d4f2e4ccdba202872dc7 (patch) | |
| tree | 6a1d8417c381c4b83207f5972ba483b7021cd1d8 /arch/x86/lib | |
| parent | 3ca9b86e2344ddea2dafc2c1edb24cf010149249 (diff) | |
| download | u-boot-cd1ee5d96e05c6ce2589d4f2e4ccdba202872dc7.zip u-boot-cd1ee5d96e05c6ce2589d4f2e4ccdba202872dc7.tar.gz u-boot-cd1ee5d96e05c6ce2589d4f2e4ccdba202872dc7.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 60a2707..bf0c921 100644 --- 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); |