summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-01-30 15:45:02 +0100
committerMichal Simek <michal.simek@xilinx.com>2015-02-09 15:13:12 +0100
commit0510b14b73cbe7e1c2b43272c7a3210af21dff31 (patch)
treefff52f463236aeba3064d6cf418518ed78cc37da /arch/microblaze
parentde86765bc4854e7961c8d0b0bd4646e90dedf864 (diff)
downloadu-boot-imx-0510b14b73cbe7e1c2b43272c7a3210af21dff31.zip
u-boot-imx-0510b14b73cbe7e1c2b43272c7a3210af21dff31.tar.gz
u-boot-imx-0510b14b73cbe7e1c2b43272c7a3210af21dff31.tar.bz2
microblaze: Do not use CONFIG_SYS_GENERIC_GLOBAL_DATA
Because it is not compatible with DM where malloc_base has to be available early and init has to be done in ASM. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/cpu/start.S6
-rw-r--r--arch/microblaze/include/asm/config.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S
index 4023ec0..3eeeab4 100644
--- a/arch/microblaze/cpu/start.S
+++ b/arch/microblaze/cpu/start.S
@@ -151,6 +151,7 @@ clear_bss:
3: /* jumping to board_init */
#ifndef CONFIG_SPL_BUILD
or r5, r0, r0 /* flags - empty */
+ addi r31, r0, _gd
brai board_init_f
#else
addi r31, r0, CONFIG_SYS_SPL_MALLOC_END
@@ -158,6 +159,11 @@ clear_bss:
#endif
1: bri 1b
+ .section .bss
+.align 4
+_gd:
+ .space GENERATED_GBL_DATA_SIZE
+
#ifndef CONFIG_SPL_BUILD
/*
* Read 16bit little endian
diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h
index 4686734..32fd636 100644
--- a/arch/microblaze/include/asm/config.h
+++ b/arch/microblaze/include/asm/config.h
@@ -13,6 +13,5 @@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
#endif