When building for 64-bit we need to put an SPL binary into the image. Update
the binman image description to reflect this.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 arch/x86/dts/binman.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/x86/dts/binman.dtsi b/arch/x86/dts/binman.dtsi
index 724913f..35a7685 100644
--- a/arch/x86/dts/binman.dtsi
+++ b/arch/x86/dts/binman.dtsi
@@ -21,9 +21,22 @@
                intel-me {
                };
 #endif
+#ifdef CONFIG_SPL
+               u-boot-spl-with-ucode-ptr {
+                       pos = <CONFIG_SPL_TEXT_BASE>;
+               };
+
+               u-boot-dtb-with-ucode2 {
+                       type = "u-boot-dtb-with-ucode";
+               };
+               u-boot {
+                       pos = <0xfff00000>;
+               };
+#else
                u-boot-with-ucode-ptr {
                        pos = <CONFIG_SYS_TEXT_BASE>;
                };
+#endif
                u-boot-dtb-with-ucode {
                };
                u-boot-ucode {
@@ -54,9 +67,15 @@
                        pos = <CONFIG_X86_REFCODE_ADDR>;
                };
 #endif
+#ifdef CONFIG_SPL
+               x86-start16-spl {
+                       pos = <CONFIG_SYS_X86_START16>;
+               };
+#else
                x86-start16 {
                        pos = <CONFIG_SYS_X86_START16>;
                };
+#endif
        };
 };
 #endif
-- 
2.8.0.rc3.226.g39d4020

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to