Skip to contentSkip to conversation

Fix SPL_EARLY_BSS applying to normal build

PATCH Superseded Brian Moyer 1 participant 3 messages Jul 19, 2020 – Jul 24, 2020 Arm (32-bit)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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.

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

 arch/arm/lib/crt0.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 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.

---

 arch/arm/lib/crt0.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/crt0.S +1 -1
index df9dd83e40..fd6c4874f8 100644
@@ -109,7 +109,7 @@ ENTRY(_main)
 	mov	r9, r0
 	bl	board_init_f_init_reserve
 
-#if defined(CONFIG_SPL_EARLY_BSS)
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_EARLY_BSS)
 	SPL_CLEAR_BSS
 #endif
 
Signature · 1 line
2.17.1
#2 lore raw

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

This felt like a sparsely used feature that I found a bug in and could easily fix as a first contribution to the project. Through more testing on my end, it seems that something is not as it appeared at first glance. Switching branches to build this patch and then back to my main development branch resulted in the same strange malloc behavior that I thought I was fixing here, which only resolved after reverting this patch.

I'd like to understand why SPL_CLEAR_BSS needs to be called in both SPL and u-boot, if someone better versed in what's going on here can take the time.

Quoted 27 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.

---

 arch/arm/lib/crt0.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/crt0.S +1 -2
index df9dd83e40..fd6c4874f8 100644
@@ -109,7 +109,7 @@ ENTRY(_main)
        mov     r9, r0
        bl      board_init_f_init_reserve
 
-#if defined(CONFIG_SPL_EARLY_BSS)
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_EARLY_BSS)
        SPL_CLEAR_BSS
 #endif
 
--

2.17.1