microblaze: Fix stack usage in interrupt handler

Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing.

Signed-off-by Michal Simek <[email protected]>

---

This code requires
"common/board_r: manual relocation for cmd table"
http://lists.denx.de/pipermail/u-boot/2015-January/201965.html

Not fully happy about it because compare to previous solution adds almost +60k on size for doing the same thing as before.

15: microblaze: Move architecture to use generic board init
microblaze: (for 1/1 boards) all +52268.0 bss -4.0 data +11724.0 rodata -2676.0 spl/u-boot-spl:all +36.0 spl/u-boot-spl:data +36.0 text +43224.0

            microblaze-generic:  all +52268  bss -4  data +11724  rodata
-2676  spl/u-boot-spl:all +36  spl/u-boot-spl:data +36  text +43224
---
 arch/microblaze/config.mk                          |   5 +
 arch/microblaze/cpu/start.S                        | 103 +++++++++++
 arch/microblaze/cpu/u-boot.lds                     |   9 +
 arch/microblaze/include/asm/config.h               |   8 +
 arch/microblaze/include/asm/u-boot.h               |  11 +-
 arch/microblaze/lib/Makefile                       |   1 -
 arch/microblaze/lib/board.c                        | 201 ---------------------
 .../xilinx/microblaze-generic/microblaze-generic.c |  46 +++++
 common/board_f.c                                   |   6 +-
 common/board_r.c                                   |   2 +-
 common/cmd_bdinfo.c                                |  13 +-
 include/configs/microblaze-generic.h               |  64 +------
 12 files changed, 196 insertions(+), 273 deletions(-)
 delete mode 100644 arch/microblaze/lib/board.c

arch/microblaze/config.mk +5 -0

index 98bbf794fa7d..2b817be61a5d 100644
@@ -15,3 +15,8 @@ endif
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
 
 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
+
+ifeq ($(CONFIG_SPL_BUILD),)
+PLATFORM_CPPFLAGS += -fPIC
+endif
+__HAVE_ARCH_GENERIC_BOARD := y

arch/microblaze/cpu/start.S +103 -0

index 14c2f12da06b..3de0e12090ea 100644
@@ -150,6 +150,7 @@ clear_bss:
        bnei    r6, 2b
 3:     /* jumping to board_init */
 #ifndef CONFIG_SPL_BUILD
+       or      r5, r0, r0      /* flags - empty */
        brai    board_init_f
 #else
        addi    r31, r0, CONFIG_SYS_SPL_MALLOC_END

@@ -190,4 +191,106 @@ out16:    bslli   r3, r6, 8
        rtsd    r15, 8
        or      r0, r0, r0
        .end    out16
+
+/*
+ * Relocate u-boot
+ */
+       .text
+       .global relocate_code
+       .ent    relocate_code
+       .align  2
+relocate_code:
+       /*
+        * r5 - start_addr_sp
+        * r6 - new_gd
+        * r7 - reloc_addr
+        */
+       addi    r1, r5, 0 /* Start to use new SP */
+       addi    r31, r6, 0 /* Start to use new GD */
+
+       add     r23, r0, r7 /* Move reloc addr to r23 */
+       /* Relocate text and data - r12 temp value */
+       addi    r21, r0, _start
+       addi    r22, r0, __end - 4 /* Include BSS too */
+1:     lwi     r12, r21, 0 /* Load u-boot data */
+       swi     r12, r23, 0 /* Write zero to loc */
+       addi    r21, r21, 4 /* Increment to next loc - origin code */
+       cmp     r12, r21, r22 /* Check if we have reach the end */
+       bneid   r12, 1b
+       addi    r23, r23, 4 /* Increment to next loc - relocate code */
+
+       /* R23 points to the base address. */
+       add     r23, r0, r7 /* Move reloc addr to r23 */
+       addi    r24, r0, CONFIG_SYS_TEXT_BASE /* Get reloc offset */
+       rsub    r23, r24, r23 /* keep - this is already here gd->reloc_off */
+
+       addik   r6, r0, 0x2 /* BIG/LITTLE endian offset */
+       lwi     r7, r0, 0x28
+       swi     r6, r0, 0x28 /* used first unused MB vector */
+       lbui    r10, r0, 0x28 /* used first unused MB vector */
+       swi     r7, r0, 0x28
+
+#ifdef CONFIG_SYS_USR_EXCEP
+       addik   r6, r0, _exception_handler
+       addk    r6, r6, r23 /* add offset */
+       sw      r6, r1, r0
+       lhu     r7, r1, r10
+       rsubi   r8, r10, 0xa
+       sh      r7, r0, r8
+       rsubi   r8, r10, 0xe
+       sh      r6, r0, r8
+#endif
+       addik   r6, r0, _hw_exception_handler
+       addk    r6, r6, r23 /* add offset */
+       sw      r6, r1, r0
+       lhu     r7, r1, r10
+       rsubi   r8, r10, 0x22
+       sh      r7, r0, r8
+       rsubi   r8, r10, 0x26
+       sh      r6, r0, r8
+
+       addik   r6, r0, _interrupt_handler
+       addk    r6, r6, r23 /* add offset */
+       sw      r6, r1, r0
+       lhu     r7, r1, r10
+       rsubi   r8, r10, 0x12
+       sh      r7, r0, r8
+       rsubi   r8, r10, 0x16
+       sh      r6, r0, r8
+
+       /* Check if GOT exist */
+       addik   r21, r23, _got_start
+       addik   r22, r23, _got_end
+       cmpu    r12, r21, r22
+       beqi    r12, 2f /* No GOT table - jump over */
+
+       /* Skip last 3 entries plus 1 because of loop boundary below */
+       addik   r22, r22, -0x10
+
+        /* Relocate the GOT. */
+3:     lw      r12, r21, r0 /* Load entry */
+       addk    r12, r12, r23 /* Add reloc offset */
+       sw      r12, r21, r0 /* Save entry back */
+
+       cmpu    r12, r21, r22 /* Check if this cross boundary */
+       bneid   r12, 3b
+       addik   r21. r21, 4
+
+       /* Update pointer to GOT */
+       mfs     r20, rpc
+       addik   r20, r20, _GLOBAL_OFFSET_TABLE_ + 8
+       addk    r20, r20, r23
+
+       /* Flush caches to ensure consistency */
+       addik   r5, r0, 0
+       addik   r6, r0, XILINX_DCACHE_BYTE_SIZE
+       bralid  r15, flush_cache
+       nop
+
+2:     addi    r5, r31, 0 /* gd is initialized in board_r.c */
+       addi    r6, r0, CONFIG_SYS_TEXT_BASE
+       addi    r12, r23, board_init_r
+       bra     r12 /* Jump to relocated code */
+
+       .end    relocate_code
 #endif

arch/microblaze/cpu/u-boot.lds +9 -0

index 44bc036172f0..2502a0db2b14 100644
@@ -33,10 +33,19 @@ SECTIONS
                __data_end = .;
        }
 
+       .got ALIGN(4):
+       {
+               _got_start = .;
+               *(.got*)
+               . = ALIGN(4);
+               _got_end = .;
+       }
+
        . = ALIGN(4);
        .u_boot_list : {
                KEEP(*(SORT(.u_boot_list*)));
        }
+       __init_end = . ;
 
        .bss ALIGN(0x4):
        {

arch/microblaze/include/asm/config.h +8 -0

index cd2973478944..468673460bfb 100644
@@ -7,4 +7,12 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_NEEDS_MANUAL_RELOC
+#endif
+
+#define CONFIG_NR_DRAM_BANKS   1
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_SYS_GENERIC_GLOBAL_DATA
+
 #endif

arch/microblaze/include/asm/u-boot.h +1 -10

index 54d415ebb5bd..66f8f952c9d0 100644
@@ -16,16 +16,7 @@
 #ifndef _U_BOOT_H_
 #define _U_BOOT_H_
 
-typedef struct bd_info {
-       unsigned long   bi_memstart;    /* start of DRAM memory */
-       phys_size_t     bi_memsize;     /* size  of DRAM memory in bytes */
-       unsigned long   bi_flashstart;  /* start of FLASH memory */
-       unsigned long   bi_flashsize;   /* size  of FLASH memory */
-       unsigned long   bi_flashoffset; /* reserved area for startup monitor */
-       unsigned long   bi_sramstart;   /* start of SRAM memory */
-       unsigned long   bi_sramsize;    /* size  of SRAM memory */
-       ulong           bi_boot_params; /* where this board expects params */
-} bd_t;
+#include <asm-generic/u-boot.h>
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_MICROBLAZE

arch/microblaze/lib/Makefile +0 -1

index 339dd153a0fd..0289d0cd609a 100644
@@ -5,6 +5,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y  += board.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += muldi3.o

arch/microblaze/lib/board.c deleted +0 -201

deleted file mode 100644
index bd028a63c078..000000000000
@@ -1,201 +0,0 @@
-/*
- * (C) Copyright 2007 Michal Simek
- * (C) Copyright 2004 Atmark Techno, Inc.
- *
- * Michal  SIMEK <[email protected]>
- * Yasushi SHOJI <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <malloc.h>
-#include <version.h>
-#include <watchdog.h>
-#include <stdio_dev.h>
-#include <serial.h>
-#include <net.h>
-#include <spi.h>
-#include <linux/compiler.h>
-#include <asm/processor.h>
-#include <asm/microblaze_intc.h>
-#include <fdtdec.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static int display_banner(void)
-{
-       printf("\n\n%s\n\n", version_string);
-       return 0;
-}
-
-/*
- * All attempts to come up with a "common" initialization sequence
- * that works for all boards and architectures failed: some of the
- * requirements are just _too_ different. To get rid of the resulting
- * mess of board dependend #ifdef'ed code we now make the whole
- * initialization sequence configurable to the user.
- *
- * The requirements for any new initalization function is simple: it
- * receives a pointer to the "global data" structure as it's only
- * argument, and returns an integer return code, where 0 means
- * "continue" and != 0 means "fatal error, hang the system".
- */
-typedef int (init_fnc_t) (void);
-
-init_fnc_t *init_sequence[] = {
-       env_init,
-#ifdef CONFIG_OF_CONTROL
-       fdtdec_check_fdt,
-#endif
-       serial_init,
-#ifndef CONFIG_SPL_BUILD
-       console_init_f,
-#endif
-       display_banner,
-#ifndef CONFIG_SPL_BUILD
-       interrupt_init,
-       timer_init,
-#endif
-       NULL,
-};
-
-unsigned long monitor_flash_len;
-
-void board_init_f(ulong not_used)
-{
-       bd_t *bd;
-       init_fnc_t **init_fnc_ptr;
-       gd = (gd_t *)(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET);
-       bd = (bd_t *)(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET
-                                               - GENERATED_BD_INFO_SIZE);
-#if defined(CONFIG_CMD_FLASH) && !defined(CONFIG_SPL_BUILD)
-       ulong flash_size = 0;
-#endif
-       asm ("nop");    /* FIXME gd is not initialize - wait */
-       memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
-       memset((void *)bd, 0, GENERATED_BD_INFO_SIZE);
-       gd->bd = bd;
-       gd->baudrate = CONFIG_BAUDRATE;
-       bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
-       bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
-       gd->flags |= GD_FLG_RELOC;      /* tell others: relocation done */
-
-       monitor_flash_len = __end - __text_start;
-
-#ifdef CONFIG_OF_EMBED
-       /* Get a pointer to the FDT */
-       gd->fdt_blob = __dtb_dt_begin;
-#elif defined CONFIG_OF_SEPARATE
-       /* FDT is at end of image */
-       gd->fdt_blob = (void *)__end;
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-       /* Allow the early environment to override the fdt address */
-       gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
-                                               (uintptr_t)gd->fdt_blob);
-#endif
-
-       /*
-        * The Malloc area is immediately below the monitor copy in DRAM
-        * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off
-        * as our monitory code is run from SDRAM
-        */
-       mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
-
-       serial_initialize();
-
-#ifdef CONFIG_XILINX_TB_WATCHDOG
-       hw_watchdog_init();
-#endif
-       for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
-               WATCHDOG_RESET();
-               if ((*init_fnc_ptr) () != 0)
-                       hang();
-       }
-
-#ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_OF_CONTROL
-       /* For now, put this check after the console is ready */
-       if (fdtdec_prepare_fdt())
-               panic("** No FDT - please see doc/README.fdt-control");
-       else
-               printf("DTB: 0x%x\n", (u32)gd->fdt_blob);
-#endif
-
-       puts("SDRAM :\n");
-       printf("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
-       printf("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
-       printf("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE);
-
-#if defined(CONFIG_CMD_FLASH)
-       puts("Flash: ");
-       bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
-       flash_size = flash_init();
-       if (bd->bi_flashstart && flash_size > 0) {
-# ifdef CONFIG_SYS_FLASH_CHECKSUM
-               print_size(flash_size, "");
-               /*
-                * Compute and print flash CRC if flashchecksum is set to 'y'
-                *
-                * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
-                */
-               if (getenv_yesno("flashchecksum") == 1) {
-                       printf("  CRC: %08X",
-                              crc32(0, (const u8 *)bd->bi_flashstart,
-                                    flash_size)
-                       );
-               }
-               putc('\n');
-# else /* !CONFIG_SYS_FLASH_CHECKSUM */
-               print_size(flash_size, "\n");
-# endif /* CONFIG_SYS_FLASH_CHECKSUM */
-               bd->bi_flashsize = flash_size;
-               bd->bi_flashoffset = bd->bi_flashstart + flash_size;
-       } else {
-               puts("Flash init FAILED");
-               bd->bi_flashstart = 0;
-               bd->bi_flashsize = 0;
-               bd->bi_flashoffset = 0;
-       }
-#endif
-
-#ifdef CONFIG_SPI
-       spi_init();
-#endif
-
-       /* relocate environment function pointers etc. */
-       env_relocate();
-
-       /* Initialize stdio devices */
-       stdio_init();
-
-       /* Initialize the jump table for applications */
-       jumptable_init();
-
-       /* Initialize the console (after the relocation and devices init) */
-       console_init_r();
-
-       board_init();
-
-       /* Initialize from environment */
-       load_addr = getenv_ulong("loadaddr", 16, load_addr);
-
-#if defined(CONFIG_CMD_NET)
-       printf("Net:   ");
-       eth_initialize(gd->bd);
-
-       uchar enetaddr[6];
-       eth_getenv_enetaddr("ethaddr", enetaddr);
-       printf("MAC:   %pM\n", enetaddr);
-#endif
-
-       /* main_loop */
-       for (;;) {
-               WATCHDOG_RESET();
-               main_loop();
-       }
-#endif /* CONFIG_SPL_BUILD */
-}

board/xilinx/microblaze-generic/microblaze-generic.c +46 -0

index 42a8d0c400e5..062e678eccb7 100644
@@ -11,16 +11,62 @@
 
 #include <common.h>
 #include <config.h>
+#include <fdtdec.h>
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/microblaze_intc.h>
 #include <asm/asm.h>
 #include <asm/gpio.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_XILINX_GPIO
 static int reset_pin = -1;
 #endif
 
+#ifdef CONFIG_OF_CONTROL
+ulong ram_base;
+
+ulong board_get_usable_ram_top(ulong total_size)
+{
+       return ram_base + gd->ram_size;
+}
+
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = ram_base;
+       gd->bd->bi_dram[0].size = get_effective_memsize();
+}
+
+phys_size_t initdram(int board_type)
+{
+       int node;
+       fdt_addr_t addr;
+       fdt_size_t size;
+       const void *blob = gd->fdt_blob;
+
+       node = fdt_node_offset_by_prop_value(blob, -1, "device_type",
+                                            "memory", 7);
+       if (node == -FDT_ERR_NOTFOUND) {
+               debug("DRAM: Can't get memory node\n");
+               return 0;
+       }
+       addr = fdtdec_get_addr_size(blob, node, "reg", &size);
+       if (addr == FDT_ADDR_T_NONE || size == 0) {
+               debug("DRAM: Can't get base address or size\n");
+               return 0;
+       }
+       ram_base = addr;
+
+       return size;
+};
+#else
+phys_size_t initdram(int board_type)
+{
+       return CONFIG_SYS_SDRAM_SIZE;
+}
+#endif
+
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 #ifdef CONFIG_XILINX_GPIO

common/board_f.c +0 -0

index 3a4b32c29dc1..64b40aebb508 100644

common/board_f.c +2 -2

 #ifdef CONFIG_BOARD_TYPES

@@ -262,7 +262,7 @@ static int zero_global_data(void)
 
 static int setup_mon_len(void)
 {
-#ifdef __ARM__
+#if defined(__ARM__) || defined(__MICROBLAZE__)
        gd->mon_len = (ulong)&__bss_end - (ulong)_start;
 #elif defined(CONFIG_SANDBOX)
        gd->mon_len = (ulong)&_end - (ulong)_init;

@@ -906,7 +906,7 @@ static init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_ARM) || defined(CONFIG_X86)
        dram_init,              /* configure available RAM banks */
 #endif
-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC)
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
        init_func_ram,
 #endif
 #ifdef CONFIG_POST

common/board_r.c +0 -0

index e712902cff45..3e77720f2acb 100644

common/board_r.c +0 -0

 #if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)

common/cmd_bdinfo.c +11 -2

index e6d8a7ae2c50..4c51059c1ba4 100644
@@ -183,8 +183,14 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        bd_t *bd = gd->bd;
-       print_num("mem start      ",    (ulong)bd->bi_memstart);
-       print_lnum("mem size       ",   (u64)bd->bi_memsize);
+       int i;
+
+       for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
+               print_num("DRAM bank",  i);
+               print_num("-> start",   bd->bi_dram[i].start);
+               print_num("-> size",    bd->bi_dram[i].size);
+       }
+
        print_num("flash start    ",    (ulong)bd->bi_flashstart);
        print_num("flash size     ",    (ulong)bd->bi_flashsize);
        print_num("flash offset   ",    (ulong)bd->bi_flashoffset);

@@ -196,6 +202,9 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_eths();
 #endif
        printf("baudrate    = %u bps\n", gd->baudrate);
+       print_num("relocaddr", gd->relocaddr);
+       print_num("reloc off", gd->reloc_off);
+
        return 0;
 }
 

include/configs/microblaze-generic.h +9 -56

index 2e1e64247fe0..622bc951045b 100644
@@ -106,62 +106,16 @@
 # define CONFIG_XILINX_TB_WATCHDOG
 #endif
 
-/*
- * memory layout - Example
- * CONFIG_SYS_TEXT_BASE = 0x1200_0000; defined in config.mk
- * CONFIG_SYS_SRAM_BASE = 0x1000_0000;
- * CONFIG_SYS_SRAM_SIZE = 0x0400_0000; 64MB
- *
- * CONFIG_SYS_MONITOR_LEN = 0x40000
- * CONFIG_SYS_MALLOC_LEN = 3 * CONFIG_SYS_MONITOR_LEN = 0xC0000
- *
- * CONFIG_SYS_GBL_DATA_OFFSET = 0x1000_0000 + 0x0400_0000 - 0x1000 = 0x13FF_F000
- * CONFIG_SYS_MONITOR_BASE = 0x13FF_F000 - CONFIG_SYS_MONITOR_LEN = 0x13FB_F000
- * CONFIG_SYS_MALLOC_BASE = 0x13FB_F000 - CONFIG_SYS_MALLOC_LEN = 0x13EF_F000
- *
- * 0x1000_0000 CONFIG_SYS_SDRAM_BASE
- *                                     MEMTEST_AREA     64kB
- *                                     FREE
- * 0x1200_0000 CONFIG_SYS_TEXT_BASE
- *             U-BOOT code
- * 0x1202_0000
- *                                     FREE
- *
- *                                     STACK
- * 0x13EF_F000 CONFIG_SYS_MALLOC_BASE
- *                                     MALLOC_AREA     768kB   Alloc
- * 0x13FB_F000 CONFIG_SYS_MONITOR_BASE
- *                                     MONITOR_CODE    256kB   Env
- * 0x13FF_F000 CONFIG_SYS_GBL_DATA_OFFSET
- *                                     GLOBAL_DATA     4kB     bd, gd
- * 0x1400_0000 CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE
- */
-
+#ifndef CONFIG_OF_CONTROL
 /* ddr sdram - main memory */
-#define        CONFIG_SYS_SDRAM_BASE           XILINX_RAM_START
-#define        CONFIG_SYS_SDRAM_SIZE           XILINX_RAM_SIZE
-#define        CONFIG_SYS_MEMTEST_START        CONFIG_SYS_SDRAM_BASE
-#define        CONFIG_SYS_MEMTEST_END          (CONFIG_SYS_SDRAM_BASE + 0x1000)
-
-/* global pointer */
-/* start of global data */
-#define        CONFIG_SYS_GBL_DATA_OFFSET \
-               (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE)
-
-/* monitor code */
-#define        SIZE                            0x40000
-#define        CONFIG_SYS_MONITOR_LEN          SIZE
-#define        CONFIG_SYS_MONITOR_BASE \
-               (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
-                       - CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE)
-#define        CONFIG_SYS_MONITOR_END \
-                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-#define        CONFIG_SYS_MALLOC_LEN           (SIZE * 3)
-#define        CONFIG_SYS_MALLOC_BASE \
-                       (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
-
-/* stack */
-#define        CONFIG_SYS_INIT_SP_OFFSET       CONFIG_SYS_MALLOC_BASE
+# define CONFIG_SYS_SDRAM_BASE XILINX_RAM_START
+# define CONFIG_SYS_SDRAM_SIZE XILINX_RAM_SIZE
+#endif
+
+#define CONFIG_SYS_MALLOC_LEN  0xC0000
+
+/* Stack location before relocation */
+#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_TEXT_BASE
 
 /*
  * CFI flash memory layout - Example
--

1.8.2.3

Hi Michal,

Quoted 6 lines · Michal Simek

Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing.

Signed-off-by Michal Simek <[email protected]>

---

common/board_f.c static int announce_dram_init(void) · line 179

Quoted 4 lines

common/board_f.c +1 -1

-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC)
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 static int init_func_ram(void)
 {

Can you use dram_init() instead?

Quoted 4 lines

common/board_r.c +0 -0

@@ -829,7 +829,7 @@ init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_ARM)

common/board_r.c init_fnc_t init_sequence_r[] = { · line 834

Quoted 6 lines

common/board_r.c +1 -1

        initr_enable_interrupts,
 #endif
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE)
        timer_init,             /* initialize timer */
 #endif

Could you use interrupt_init() immediately before?

Hi Simon,

Quoted 9 lines · Simon Glass

Hi Michal,

Quoted 6 lines · Michal Simek

Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing.

Signed-off-by Michal Simek <[email protected]>

---

...

Quoted 6 lines

common/board_f.c static int announce_dram_init(void) · line 179

Quoted 4 lines

common/board_f.c +1 -1

-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC)
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 static int init_func_ram(void)
 {

Can you use dram_init() instead?

No problem will do it in v2.

Where dram_init(void) should be declared?
I see that others have it in arch header. Maybe better to have it in any shared location.

Quoted 13 lines

common/board_r.c init_fnc_t init_sequence_r[] = { · line 834

Quoted 11 lines

common/board_r.c +1 -1

@@ -829,7 +829,7 @@ init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_ARM)
        initr_enable_interrupts,
 #endif
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE)
        timer_init,             /* initialize timer */
 #endif

Could you use interrupt_init() immediately before?

What do you mean by that?
Do you want to do timer_init in interrupt_init()?

Hi Michal,

Quoted 22 lines · Michal Simek

Hi Simon,

Quoted 9 lines · Simon Glass

Hi Michal,

Quoted 6 lines · Michal Simek

Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing.

Signed-off-by Michal Simek <[email protected]>

---

...

Quoted 6 lines

common/board_f.c static int announce_dram_init(void) · line 179

Quoted 4 lines

common/board_f.c +1 -1

-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC)
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 static int init_func_ram(void)
 {

Can you use dram_init() instead?

Quoted 5 lines

No problem will do it in v2.

Where dram_init(void) should be declared?
I see that others have it in arch header. Maybe better to have it in any shared location.

Yes a shared location makes sense.

Quoted 15 lines

Quoted 14 lines

common/board_r.c init_fnc_t init_sequence_r[] = { · line 834

Quoted 12 lines

common/board_r.c +1 -1

@@ -829,7 +829,7 @@ init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_ARM)
        initr_enable_interrupts,
 #endif
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE)
        timer_init,             /* initialize timer */
 #endif

Could you use interrupt_init() immediately before?

Quoted 2 lines

What do you mean by that?
Do you want to do timer_init in interrupt_init()?

Yes, then if we remove it from x86 also we can drop both #ifdefs. Do you see any drawback with that?

Hi Simon,

Quoted 26 lines · Simon Glass

Hi Michal,

Quoted 22 lines · Michal Simek

Hi Simon,

Quoted 9 lines · Simon Glass

Hi Michal,

Quoted 6 lines · Michal Simek

Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing.

Signed-off-by Michal Simek <[email protected]>

---

...

Quoted 6 lines

common/board_f.c static int announce_dram_init(void) · line 179

Quoted 4 lines

common/board_f.c +1 -1

-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC)
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 static int init_func_ram(void)
 {

Can you use dram_init() instead?

Quoted 7 lines

Quoted 5 lines

No problem will do it in v2.

Where dram_init(void) should be declared?
I see that others have it in arch header. Maybe better to have it in any shared location.

Yes a shared location makes sense.

I have sent patch for it. Please review.

Quoted 15 lines

Quoted 15 lines

Quoted 14 lines

common/board_r.c init_fnc_t init_sequence_r[] = { · line 834

Quoted 12 lines

common/board_r.c +1 -1

@@ -829,7 +829,7 @@ init_fnc_t init_sequence_r[] = {
 #if defined(CONFIG_ARM)
        initr_enable_interrupts,
 #endif
-#ifdef CONFIG_X86
+#if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE)
        timer_init,             /* initialize timer */
 #endif

Could you use interrupt_init() immediately before?

Quoted 5 lines

Quoted 2 lines

What do you mean by that?
Do you want to do timer_init in interrupt_init()?

Yes, then if we remove it from x86 also we can drop both #ifdefs. Do you see any drawback with that?

timer_init looks like standard function which is used by x86 (board_r), arm, mips, blackfin. (board_f)

Based on board_r.c PPC is doing timer_init in cpu_init_r.

For Microblaze my preference is to use this location because timer code is using interrupts which are initialized above.

Adding timer_init to interrupt_init doesn't look right because then interrupt_init will hide one init step.