Skip to contentSkip to conversation

Fix SPL_EARLY_BSS applying to normal build

PATCH New Brian Moyer 2 participants 3 messages Jul 26, 2020 – Aug 5, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

v2 cover Fix SPL_EARLY_BSS applying to normal build

SPL_CLEAR_BSS is called regardless of build type if CONFIG_SPL_EARLY_BSS is defined. This seems to break u-boot proper and doesn't seem like the correct behavior.

Early bss clearing in u-boot proper happens before relocation and causes lots of problems because .rel.dyn and .bss overlap.

Changes in v2:
- Adding a check to the first SPL_CLEAR_BSS resulted in BSS never getting cleared for u-boot proper. Added an or condition to the second call.
- SPL_CLEAR_BSS is the only bss clearing operation. Renamed to just CLEAR_BSS for clarity.

Brian Moyer (1):
arm: Add SPL build check to SPL early bss clear

 arch/arm/lib/crt0.S | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 arm: Add SPL build check to SPL early bss clear

SPL_CLEAR_BSS is called regardless of build type if CONFIG_SPL_EARLY_BSS is defined. Add a guard for CONFIG_SPL_BUILD to fix.

---

Changes in v2:
- Adding a check to the first SPL_CLEAR_BSS resulted in BSS never getting cleared for u-boot proper. Added an or condition to the second call.
- SPL_CLEAR_BSS is the only bss clearing operation. Renamed to just CLEAR_BSS for clarity.

 arch/arm/lib/crt0.S | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/lib/crt0.S +5 -5
index df9dd83e40..46b6be21a8 100644
@@ -64,7 +64,7 @@
  * can afford it due to sufficient memory being available early.
  */
 
-.macro SPL_CLEAR_BSS
+.macro CLEAR_BSS
 	ldr	r0, =__bss_start	/* this is auto-relocated! */
 
 #ifdef CONFIG_USE_ARCH_MEMSET
@@ -109,8 +109,8 @@ ENTRY(_main)
 	mov	r9, r0
 	bl	board_init_f_init_reserve
 
-#if defined(CONFIG_SPL_EARLY_BSS)
-	SPL_CLEAR_BSS
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_EARLY_BSS)
+	CLEAR_BSS
 #endif
 
 	mov	r0, #0
@@ -150,8 +150,8 @@ here:
 #endif
 #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(FRAMEWORK)
 
-#if !defined(CONFIG_SPL_EARLY_BSS)
-	SPL_CLEAR_BSS
+#if !defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_EARLY_BSS)
+	CLEAR_BSS
 #endif
 
 # ifdef CONFIG_SPL_BUILD
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/1 arm: Add SPL build check to SPL early bss clear

Quoted 5 lines · Brian Moyer

SPL_CLEAR_BSS is called regardless of build type if CONFIG_SPL_EARLY_BSS is defined. Add a guard for CONFIG_SPL_BUILD to fix.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200805/90a729f5/attachment.sig>