diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-01-30 15:46:43 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-02-09 15:13:12 +0100 |
| commit | 405e651d705e197babe423ef88e8224e2737fc06 (patch) | |
| tree | 8e46f7b885169ce2ce535d25e500334bbce82ece | |
| parent | 0510b14b73cbe7e1c2b43272c7a3210af21dff31 (diff) | |
| download | u-boot-imx-405e651d705e197babe423ef88e8224e2737fc06.zip u-boot-imx-405e651d705e197babe423ef88e8224e2737fc06.tar.gz u-boot-imx-405e651d705e197babe423ef88e8224e2737fc06.tar.bz2 | |
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>
| -rw-r--r-- | arch/microblaze/cpu/start.S | 8 | ||||
| -rw-r--r-- | include/configs/microblaze-generic.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 3eeeab4..cf9ee7e 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -30,7 +30,11 @@ _start: mts rshr, r1 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 addi r1, r0, CONFIG_SYS_INIT_SP_OFFSET +#endif mts rshr, r1 addi r1, r1, -4 /* Decrement SP to top of memory */ @@ -152,6 +156,10 @@ clear_bss: #ifndef CONFIG_SPL_BUILD or r5, r0, r0 /* flags - empty */ 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 #else addi r31, r0, CONFIG_SYS_SPL_MALLOC_END diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 622bc95..770acbe 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -113,6 +113,7 @@ #endif #define CONFIG_SYS_MALLOC_LEN 0xC0000 +#define CONFIG_SYS_MALLOC_F_LEN 1024 /* Stack location before relocation */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_TEXT_BASE |