From: Simon Glass <sjg@chromium.org>
Date: Sat, 7 Dec 2019 04:42:32 +0000 (-0700)
Subject: x86: Don't repeat microcode in U-Boot if not needed
X-Git-Tag: v2020.10~431^2~2^2~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f1f507298e152a97d2aef31c1cd7d9fdec1dafc;p=platform%2Fkernel%2Fu-boot.git

x86: Don't repeat microcode in U-Boot if not needed

At present if SPL sets up the microcode then it is still included in
U-Boot as well. This is wasteful as microcode is large. Adjust the logic
in the image to prevent this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 5ebff4f..e0cca58 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -63,9 +63,16 @@
 		offset = <CONFIG_X86_OFFSET_U_BOOT>;
 	};
 #else
+# ifdef CONFIG_SPL
+	u-boot {
+		offset = <CONFIG_SYS_TEXT_BASE>;
+	};
+# else
+	/* If there is no SPL then we need to put microcode in U-Boot */
 	u-boot-with-ucode-ptr {
 		offset = <CONFIG_X86_OFFSET_U_BOOT>;
 	};
+# endif
 #endif
 #ifdef CONFIG_HAVE_MICROCODE
 	u-boot-dtb-with-ucode {