| Message ID | A1484485FD99714DB2AB2C5EF81E7AC2AA766B80@ORSMSX116.amr.corp.intel.com |
|---|---|
| State | Accepted |
| Commit | dbaec467671fd5b56cf380121340844863f5472d |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Add basic Slim Bootloader payload support | expand |
On Sat, Aug 3, 2019 at 4:31 PM Park, Aiden <aiden.park@intel.com> wrote: > > The setting up MTRRs have already been done in previous > Slim Bootloader stages. > > Signed-off-by: Aiden Park <aiden.park@intel.com> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > --- > arch/x86/lib/init_helpers.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Tested-by: Bin Meng <bmeng.cn@gmail.com>
On Thu, Aug 8, 2019 at 10:35 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Sat, Aug 3, 2019 at 4:31 PM Park, Aiden <aiden.park@intel.com> wrote: > > > > The setting up MTRRs have already been done in previous > > Slim Bootloader stages. > > > > Signed-off-by: Aiden Park <aiden.park@intel.com> > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > > --- > > arch/x86/lib/init_helpers.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > Tested-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 0481f453ca..5e19f13720 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -18,7 +18,8 @@ __weak ulong board_get_usable_ram_top(ulong total_size) int init_cache_f_r(void) { -#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) && \ + !defined(CONFIG_SYS_SLIMBOOTLOADER) int ret; ret = mtrr_commit(false);