summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-01-16 07:04:23 -0700
committerBin Meng <bmeng.cn@gmail.com>2017-02-07 13:10:56 +0800
commit164f0414dad8d468b9f2a5fd545b657cf6068e58 (patch)
tree80a8911ca5ff42a78a4cc4ccdca43758dbbc443c /arch/x86
parent19f8b32cea3021b116ad196eb0194af22532fcd8 (diff)
downloadu-boot-imx-164f0414dad8d468b9f2a5fd545b657cf6068e58.zip
u-boot-imx-164f0414dad8d468b9f2a5fd545b657cf6068e58.tar.gz
u-boot-imx-164f0414dad8d468b9f2a5fd545b657cf6068e58.tar.bz2
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/dts/u-boot.dtsi19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 31f0b1a..69c1c1d 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