From: Simon Glass <sjg@chromium.org>
Date: Sun, 24 Jan 2021 17:06:06 +0000 (-0700)
Subject: x86: spl: Make moving BSS conditional
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=76baecf6702bfb6ccf9fb316edc4b6737fa6602c;p=u-boot.git

x86: spl: Make moving BSS conditional

At present BSS is always placed in SDRAM. If a separate BSS is not in use
this means that BSS doesn't work as expected. Make the setting conditional
on the SEPARATE_BSS option.

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

diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds
index ead4f380e7..b82e53ab12 100644
--- a/arch/x86/cpu/u-boot-spl.lds
+++ b/arch/x86/cpu/u-boot-spl.lds
@@ -57,7 +57,9 @@ SECTIONS
 
         _image_binary_end = .;
 
+#if CONFIG_IS_ENABLED(SEPARATE_BSS)
 	. = 0x120000;
+#endif
 	.bss (OVERLAY) : {
 		__bss_start = .;
 		*(.bss*)