From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 18 Jan 2017 11:32:58 +0000 (-0800)
Subject: x86: qemu: Mark ucode as optional for SPL in u-boot.dtsi
X-Git-Tag: v2017.03-rc2~45
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=399de922ff74a215964cd039c5025538f75e6b73;p=u-boot

x86: qemu: Mark ucode as optional for SPL in u-boot.dtsi

QEMU does not need ucode and this is indicated in u-boot.dtsi
for U-Boot proper. Now add the same for SPL.

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

diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi
index 56d34af927..7714ed0b77 100644
--- a/arch/x86/dts/emulation-u-boot.dtsi
+++ b/arch/x86/dts/emulation-u-boot.dtsi
@@ -10,9 +10,15 @@
 #ifdef CONFIG_ROM_SIZE
 / {
 	binman {
+#ifdef CONFIG_SPL
+		u-boot-spl-with-ucode-ptr {
+			optional-ucode;
+		};
+#else
 		u-boot-with-ucode-ptr {
 			optional-ucode;
 		};
+#endif
 	};
 };
 #endif