]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spl: Commit MTRRs only in board_init_f_r()
authorSimon Glass <sjg@chromium.org>
Thu, 4 May 2023 22:50:58 +0000 (16:50 -0600)
committerBin Meng <bmeng@tinylab.org>
Thu, 11 May 2023 02:25:29 +0000 (10:25 +0800)
We don't need to commit the SPI-flash MTRR change immediately, since it is
now done in the board_init_f_r(). Also this causes chromebook_link64 to
hang, presumably since we are still running from CAR (Cache-as-RAM) in
SPL. Coral handles this OK, perhaps since it is running from a different
memory area, but it has no effect on Coral anyway.

Drop the extra mtrr_commit() in the SPL implementation.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
arch/x86/lib/spl.c

index 61eb026c862a7d939d53f4e2930c5f9b009e7468..ca1645f9d68762c2840d37e62b5fbf2b26fb08a0 100644 (file)
@@ -147,7 +147,6 @@ static int x86_spl_init(void)
                debug("%s: SPI cache setup failed (err=%d)\n", __func__, ret);
                return ret;
        }
-       mtrr_commit(true);
 # else
        ret = syscon_get_by_driver_data(X86_SYSCON_PUNIT, &punit);
        if (ret)