- const ulong uboot_size = (uintptr_t)&__bss_end -
- (uintptr_t)&__text_start;
- ulong total_size;
- ulong dest_addr;
- ulong fdt_size = 0;
-
-#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL)
- if (gd->fdt_blob)
- fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
-#endif
- total_size = ALIGN(uboot_size, 1 << 12) + CONFIG_SYS_MALLOC_LEN +
- CONFIG_SYS_STACK_SIZE + fdt_size;
-
- dest_addr = board_get_usable_ram_top(total_size);
- /*
- * NOTE: All destination address are rounded down to 16-byte
- * boundary to satisfy various worst-case alignment
- * requirements
- */
- dest_addr &= ~15;
-
-#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL)
- /*
- * If the device tree is sitting immediate above our image then we
- * must relocate it. If it is embedded in the data section, then it
- * will be relocated with other data.
- */
- if (gd->fdt_blob) {
- dest_addr -= fdt_size;
- gd->new_fdt = (void *)dest_addr;
- dest_addr &= ~15;
+ bool do_mtrr = CONFIG_IS_ENABLED(X86_32BIT_INIT) ||
+ IS_ENABLED(CONFIG_FSP_VERSION2);
+ int ret;
+
+ do_mtrr &= !IS_ENABLED(CONFIG_FSP_VERSION1) &&
+ !IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);
+
+ if (do_mtrr) {
+ ret = mtrr_commit(false);
+ /*
+ * If MTRR MSR is not implemented by the processor, just ignore
+ * it
+ */
+ if (ret && ret != -ENOSYS)
+ return ret;