x86: link: Add SPL declarations to the binman image

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 <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 31f0b1aa10d163958c1e838e573e9908a2ec3001..69c1c1d498673c30d9f941e1e5fdeff50c0e499a 100644 (file)
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.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 {
@@ -57,9 +70,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