summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid Feng <fenghua@phytium.com.cn>2015-01-31 11:55:28 +0800
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-03-27 16:28:58 +0100
commitb263302aa588464cec3bbdde09e2b52765dbae9e (patch)
tree3e92efaf2431fe745addb8251d79a668f20337ae /arch
parentf643d9294f45487f22e8f33d6572530f17eff4e9 (diff)
downloadu-boot-imx-b263302aa588464cec3bbdde09e2b52765dbae9e.zip
u-boot-imx-b263302aa588464cec3bbdde09e2b52765dbae9e.tar.gz
u-boot-imx-b263302aa588464cec3bbdde09e2b52765dbae9e.tar.bz2
ARMv8: enable pre-allocation malloc
Allocate memory space for pre-allocation malloc and zero global data. This code is partly from crt0.S. Signed-off-by: David Feng <fenghua@phytium.com.cn>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/config.h4
-rw-r--r--arch/arm/lib/crt0_64.S13
2 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index be80434..7a34a01 100644
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -7,10 +7,6 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
-#ifdef __aarch64__
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
-#endif
-
#define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
index 7756396..1654011 100644
--- a/arch/arm/lib/crt0_64.S
+++ b/arch/arm/lib/crt0_64.S
@@ -62,9 +62,18 @@ ENTRY(_main)
* Set up initial C runtime environment and call board_init_f(0).
*/
ldr x0, =(CONFIG_SYS_INIT_SP_ADDR)
- sub x0, x0, #GD_SIZE /* allocate one GD above SP */
+ sub x18, x0, #GD_SIZE /* allocate one GD above SP */
+ bic x18, x18, #0x7 /* 8-byte alignment for GD */
+zero_gd:
+ sub x0, x0, #0x8
+ str xzr, [x0]
+ cmp x0, x18
+ b.gt zero_gd
+#if defined(CONFIG_SYS_MALLOC_F_LEN)
+ sub x0, x18, #CONFIG_SYS_MALLOC_F_LEN
+ str x0, [x18, #GD_MALLOC_BASE]
+#endif
bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */
- mov x18, sp /* GD is above SP */
mov x0, #0
bl board_init_f