V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

microblaze: Add support for CONFIG_SYS_MALLOC_F_LEN 

Create space for dm_init where calloc is called
and malloc_base has to be initialized.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-01-30 15:46:43 +01:00
parent 0510b14b73
commit 405e651d70
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/microblaze/cpu/start.S
View File

@ -29,8 +29,12 @@ _start:
addi r1, r0, CONFIG_SPL_STACK_ADDR addi r1, r0, CONFIG_SPL_STACK_ADDR
mts rshr, r1 mts rshr, r1
addi r1, r1, -4 /* Decrement SP to top of memory */ addi r1, r1, -4 /* Decrement SP to top of memory */
#else
#if defined(CONFIG_SYS_MALLOC_F_LEN)
addi r1, r0, CONFIG_SYS_INIT_SP_OFFSET - CONFIG_SYS_MALLOC_F_LEN
#else #else
addi r1, r0, CONFIG_SYS_INIT_SP_OFFSET addi r1, r0, CONFIG_SYS_INIT_SP_OFFSET
#endif
mts rshr, r1 mts rshr, r1
addi r1, r1, -4 /* Decrement SP to top of memory */ addi r1, r1, -4 /* Decrement SP to top of memory */
@ -152,6 +156,10 @@ clear_bss:
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
or r5, r0, r0 /* flags - empty */ or r5, r0, r0 /* flags - empty */
addi r31, r0, _gd addi r31, r0, _gd
#if defined(CONFIG_SYS_MALLOC_F_LEN)
addi r6, r0, CONFIG_SYS_INIT_SP_OFFSET
swi r6, r31, GD_MALLOC_BASE
#endif
brai board_init_f brai board_init_f
#else #else
addi r31, r0, CONFIG_SYS_SPL_MALLOC_END addi r31, r0, CONFIG_SYS_SPL_MALLOC_END

1
include/configs/microblaze-generic.h
View File

@ -113,6 +113,7 @@
#endif #endif
#define CONFIG_SYS_MALLOC_LEN 0xC0000 #define CONFIG_SYS_MALLOC_LEN 0xC0000
#define CONFIG_SYS_MALLOC_F_LEN 1024
/* Stack location before relocation */ /* Stack location before relocation */
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_TEXT_BASE