dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm: Add SPL build check to SPL early bss clear

Browse Source 
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.

Signed-off-by: Brian Moyer <bdm310@gmail.com>
This commit is contained in:
Brian Moyer
2020-07-26 13:17:53 -07:00
committed by Tom Rini
parent 7f89e85631
commit dfd2390dff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/lib/crt0.S
View File

@@ -64,7 +64,7 @@
* can afford it due to sufficient memory being available early. * 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! */ ldr r0, =__bss_start /* this is auto-relocated! */
#ifdef CONFIG_USE_ARCH_MEMSET #ifdef CONFIG_USE_ARCH_MEMSET
@@ -109,8 +109,8 @@ ENTRY(_main)
mov r9, r0 mov r9, r0
bl board_init_f_init_reserve 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 CLEAR_BSS
#endif #endif
mov r0, #0 mov r0, #0
@@ -150,8 +150,8 @@ here:
#endif #endif
#if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(FRAMEWORK) #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(FRAMEWORK)
#if !defined(CONFIG_SPL_EARLY_BSS) #if !defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_EARLY_BSS)
SPL_CLEAR_BSS CLEAR_BSS
#endif #endif
# ifdef CONFIG_SPL_BUILD # ifdef CONFIG_SPL_BUILD