Call generic board_late_init_xilinx() to be aligned with the rest of xilinx
platforms. Also getting rid of initrd_high/fdt_high and use
bootm_low/boot_size instead.
Reported-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
phys_size_t bootm_size = gd->ram_size;
struct bd_info *bd = gd->bd;
phys_size_t bootm_size = gd->ram_size;
struct bd_info *bd = gd->bd;
- if (bd->bi_dram[0].start) {
+ if (!CONFIG_IS_ENABLED(MICROBLAZE) && bd->bi_dram[0].start) {
ulong scriptaddr;
scriptaddr = env_get_hex("scriptaddr", 0);
ulong scriptaddr;
scriptaddr = env_get_hex("scriptaddr", 0);
bd->bi_dram[0].start + scriptaddr);
}
bd->bi_dram[0].start + scriptaddr);
}
- if (CONFIG_IS_ENABLED(ARCH_ZYNQ))
+ if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE))
bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M));
ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);
bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M));
ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);
#include <dm/lists.h>
#include <fdtdec.h>
#include <linux/sizes.h>
#include <dm/lists.h>
#include <fdtdec.h>
#include <linux/sizes.h>
+#include "../common/board.h"
int board_late_init(void)
{
int board_late_init(void)
{
- ulong max_size, lowmem_size;
u32 status = 0;
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SYSRESET_MICROBLAZE)
u32 status = 0;
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SYSRESET_MICROBLAZE)
max_size = gd->start_addr_sp - CONFIG_STACK_SIZE;
max_size = round_down(max_size, SZ_16M);
max_size = gd->start_addr_sp - CONFIG_STACK_SIZE;
max_size = round_down(max_size, SZ_16M);
- /* Linux default LOWMEM_SIZE is 0x30000000 = 768MB */
- lowmem_size = gd->ram_base + 768 * 1024 * 1024;
-
- status |= env_set_addr("initrd_high", (void *)min_t(ulong, max_size,
- lowmem_size));
- status |= env_set_addr("fdt_high", (void *)min_t(ulong, max_size,
- lowmem_size));
-
status |= env_set_hex("scriptaddr", max_size + SZ_2M);
status |= env_set_hex("pxefile_addr_r", max_size + SZ_1M);
status |= env_set_hex("scriptaddr", max_size + SZ_2M);
status |= env_set_hex("pxefile_addr_r", max_size + SZ_1M);
status |= env_set_hex("ramdisk_addr_r",
gd->ram_base + SZ_32M + SZ_4M + SZ_2M);
status |= env_set_hex("ramdisk_addr_r",
gd->ram_base + SZ_32M + SZ_4M + SZ_2M);
- status |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);
-
if (status)
printf("%s: Saving run time variables FAILED\n", __func__);
if (status)
printf("%s: Saving run time variables FAILED\n", __func__);
+ return board_late_init_xilinx();