mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 08:57:58 +00:00
d7b5cc89d3
Microblaze can also have reserved space in DT which u-boot has to avoid to
placing self to that location. The same change was done in Zynqmp by commit
ce39ee28ec ("zynqmp: Do not place u-boot to reserved memory location").
This feature was tested with this memory description on kc705:
memory {
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
alloc@b00000000 {
reg = <0xb0000000 0x10000000>;
no-map;
};
alloc@a8000000 {
reg = <0xa8000000 0x00010000>;
no-map;
};
};
And in U-Boot log you can check u-boot relocation address and reserved
locations.
U-Boot 2022.01-03974-gb1b4c2dea9b9 (Feb 25 2022 - 11:59:48 +0100)
Model: Xilinx MicroBlaze
DRAM: 1 GiB
Flash: 128 MiB
Loading Environment from nowhere... OK
In: serial
Out: serial
Err: serial
Model: Xilinx MicroBlaze
Net: AXI EMAC: 40c00000, phyaddr 7, interface gmii
eth0: ethernet@40c00000
U-BOOT for microblaze-generic
U-Boot-mONStR> bdi
...
DRAM bank = 0x00000000
-> start = 0x80000000
-> size = 0x40000000
...
relocaddr = 0xaff69000
...
lmb_dump_all:
memory.cnt = 0x1
memory[0] [0x80000000-0xbfffffff], 0x40000000 bytes flags: 0
reserved.cnt = 0x3
reserved[0] [0xa8000000-0xa800ffff], 0x00010000 bytes flags: 4
reserved[1] [0xafe87bb0-0xafffffff], 0x00178450 bytes flags: 0
reserved[2] [0xb0000000-0xbfffffff], 0x10000000 bytes flags: 4
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/ea0a8ccce723478eb518f6fdceb91d4f129efb68.1646122398.git.michal.simek@xilinx.com
100 lines
2.2 KiB
C
100 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2007-2018 Michal Simek
|
|
*
|
|
* Michal SIMEK <monstr@monstr.eu>
|
|
*/
|
|
|
|
/*
|
|
* This is a board specific file. It's OK to include board specific
|
|
* header files
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <env.h>
|
|
#include <init.h>
|
|
#include <image.h>
|
|
#include <lmb.h>
|
|
#include <log.h>
|
|
#include <asm/global_data.h>
|
|
#include <dm/lists.h>
|
|
#include <fdtdec.h>
|
|
#include <linux/sizes.h>
|
|
#include "../common/board.h"
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int dram_init_banksize(void)
|
|
{
|
|
return fdtdec_setup_memory_banksize();
|
|
}
|
|
|
|
int dram_init(void)
|
|
{
|
|
if (fdtdec_setup_mem_size_base() != 0)
|
|
return -EINVAL;
|
|
|
|
return 0;
|
|
};
|
|
|
|
ulong board_get_usable_ram_top(ulong total_size)
|
|
{
|
|
phys_size_t size;
|
|
phys_addr_t reg;
|
|
struct lmb lmb;
|
|
|
|
/* found enough not-reserved memory to relocated U-Boot */
|
|
lmb_init(&lmb);
|
|
lmb_add(&lmb, gd->ram_base, gd->ram_size);
|
|
boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
|
|
size = ALIGN(CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE);
|
|
reg = lmb_alloc(&lmb, size, MMU_SECTION_SIZE);
|
|
|
|
if (!reg)
|
|
reg = gd->ram_top - size;
|
|
|
|
return reg + size;
|
|
}
|
|
|
|
int board_late_init(void)
|
|
{
|
|
ulong max_size;
|
|
u32 status = 0;
|
|
|
|
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SYSRESET_MICROBLAZE)
|
|
int ret;
|
|
|
|
ret = device_bind_driver(gd->dm_root, "mb_soft_reset",
|
|
"reset_soft", NULL);
|
|
if (ret)
|
|
printf("Warning: No reset driver: ret=%d\n", ret);
|
|
#endif
|
|
|
|
if (!(gd->flags & GD_FLG_ENV_DEFAULT)) {
|
|
debug("Saved variables - Skipping\n");
|
|
return 0;
|
|
}
|
|
|
|
max_size = gd->start_addr_sp - CONFIG_STACK_SIZE;
|
|
max_size = round_down(max_size, SZ_16M);
|
|
|
|
status |= env_set_hex("scriptaddr", max_size + SZ_2M);
|
|
|
|
status |= env_set_hex("pxefile_addr_r", max_size + SZ_1M);
|
|
|
|
status |= env_set_hex("kernel_addr_r", gd->ram_base + SZ_32M);
|
|
|
|
status |= env_set_hex("fdt_addr_r", gd->ram_base + SZ_32M - SZ_1M);
|
|
|
|
status |= env_set_hex("ramdisk_addr_r",
|
|
gd->ram_base + SZ_32M + SZ_4M + SZ_2M);
|
|
if (IS_ENABLED(CONFIG_MTD_NOR_FLASH))
|
|
status |= env_set_hex("script_offset_nor",
|
|
gd->bd->bi_flashstart +
|
|
CONFIG_BOOT_SCRIPT_OFFSET);
|
|
if (status)
|
|
printf("%s: Saving run time variables FAILED\n", __func__);
|
|
|
|
return board_late_init_xilinx();
|
|
}
|