[U-Boot] [PATCH v3 58/62] x86: link: Add SPL declarations to the binman image
Simon Glass
sjg at chromium.org
Mon Jan 16 15:04:23 CET 2017
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 at chromium.org>
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
---
Changes in v3: None
Changes in v2: None
arch/x86/dts/u-boot.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 31f0b1aa10d..69c1c1d4986 100644
--- 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
--
2.11.0.483.g087da7b7c-goog
More information about the U-Boot
mailing list