diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-01-27 14:06:14 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-02-09 15:09:58 +0100 |
| commit | 9cef20b10929d7ad047b071c3dcb924401bf78e8 (patch) | |
| tree | dd178815169e611b95521d61a0cbcc40436f69ab /arch/microblaze | |
| parent | e4a4743e487f758cfc37528a8d6d4066cf781bc6 (diff) | |
| download | blackbird-obmc-uboot-9cef20b10929d7ad047b071c3dcb924401bf78e8.tar.gz blackbird-obmc-uboot-9cef20b10929d7ad047b071c3dcb924401bf78e8.zip | |
microblaze: Fix gd_t address which is placed at the end of BRAM
Setup gd from ASM to be availalbe for board_init_r.
Setting it up in spl_board_init is too late when
MALLOC is used.
Space for gd is located behind MALLOC area at the end of BRAM.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/cpu/spl.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/cpu/start.S | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index 091226133e..2cc0a2da89 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -25,8 +25,6 @@ u32 spl_boot_device(void) /* Board initialization after bss clearance */ void spl_board_init(void) { - gd = (gd_t *)CONFIG_SPL_STACK_ADDR; - /* enable console uart printing */ preloader_console_init(); } diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index e0e3470a18..14c2f12da0 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -152,6 +152,7 @@ clear_bss: #ifndef CONFIG_SPL_BUILD brai board_init_f #else + addi r31, r0, CONFIG_SYS_SPL_MALLOC_END brai board_init_r #endif 1: bri 1b |
