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>

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index be80434dee4d0dc9824f6f74e198a51be40f938b..7a34a0186cb1cd255aee62b8d992756536fc3fd9 100644 (file)
--- 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 77563967e517902863a530967f4c2ea02e891305..16540114323418895fb95f5afcf0176cc2c9b1b2 100644 (file)
--- 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