Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "boot: fdt: Change type of env_get_bootm_low() to phys_addr_t"

Browse source
This commit is contained in:
Tom Rini 2024-04-11 09:39:04 -06:00
commit 01437e3145
4 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot/bootm.c
View file

@ -242,13 +242,13 @@ static int boot_get_kernel(const char *addr_fit, struct bootm_headers *images,
#ifdef CONFIG_LMB
static void boot_start_lmb(struct bootm_headers *images)
{
ulong mem_start;
phys_addr_t mem_start;
phys_size_t mem_size;
mem_start = env_get_bootm_low();
mem_size = env_get_bootm_size();
lmb_init_and_reserve_range(&images->lmb, (phys_addr_t)mem_start,
lmb_init_and_reserve_range(&images->lmb, mem_start,
mem_size, NULL);
}
#else

37
boot/image-board.c
View file

@ -107,14 +107,12 @@ static int on_loadaddr(const char *name, const char *value, enum env_op op,
}
U_BOOT_ENV_CALLBACK(loadaddr, on_loadaddr);
ulong env_get_bootm_low(void)
phys_addr_t env_get_bootm_low(void)
{
char *s = env_get("bootm_low");
if (s) {
ulong tmp = hextoul(s, NULL);
return tmp;
}
if (s)
return simple_strtoull(s, NULL, 16);
#if defined(CFG_SYS_SDRAM_BASE)
return CFG_SYS_SDRAM_BASE;
@ -127,14 +125,12 @@ ulong env_get_bootm_low(void)
phys_size_t env_get_bootm_size(void)
{
phys_size_t tmp, size;
phys_addr_t start;
phys_addr_t start, low;
phys_size_t size;
char *s = env_get("bootm_size");
if (s) {
tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
return tmp;
}
if (s)
return simple_strtoull(s, NULL, 16);
start = gd->ram_base;
size = gd->ram_size;
@ -144,22 +140,19 @@ phys_size_t env_get_bootm_size(void)
s = env_get("bootm_low");
if (s)
tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
low = simple_strtoull(s, NULL, 16);
else
tmp = start;
low = start;
return size - (tmp - start);
return size - (low - start);
}
phys_size_t env_get_bootm_mapsize(void)
{
phys_size_t tmp;
char *s = env_get("bootm_mapsize");
if (s) {
tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
return tmp;
}
if (s)
return simple_strtoull(s, NULL, 16);
#if defined(CFG_SYS_BOOTMAPSZ)
return CFG_SYS_BOOTMAPSZ;
@ -538,7 +531,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
ulong *initrd_start, ulong *initrd_end)
{
char *s;
ulong initrd_high;
phys_addr_t initrd_high;
int initrd_copy_to_ram = 1;
s = env_get("initrd_high");
@ -553,8 +546,8 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
initrd_high = env_get_bootm_mapsize() + env_get_bootm_low();
}
debug("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
initrd_high, initrd_copy_to_ram);
debug("## initrd_high = 0x%llx, copy_to_ram = %d\n",
(u64)initrd_high, initrd_copy_to_ram);
if (rd_data) {
if (!initrd_copy_to_ram) { /* zero-copy ramdisk support */

19
boot/image-fdt.c
View file

@ -160,9 +160,11 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
{
void *fdt_blob = *of_flat_tree;
void *of_start = NULL;
u64 start, size, usable;
phys_addr_t start, size, usable;
char *fdt_high;
ulong mapsize, low;
phys_addr_t addr;
phys_addr_t low;
phys_size_t mapsize;
ulong of_len = 0;
int bank;
int err;
@ -185,7 +187,6 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
fdt_high = env_get("fdt_high");
if (fdt_high) {
ulong desired_addr = hextoul(fdt_high, NULL);
ulong addr;
if (desired_addr == ~0UL) {
/* All ones means use fdt in place */
@ -217,14 +218,14 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
if (start + size < low)
continue;
usable = min(start + size, (u64)(low + mapsize));
/*
* At least part of this DRAM bank is usable, try
* using it for LMB allocation.
* using the DRAM bank up to 'usable' address limit
* for LMB allocation.
*/
of_start = map_sysmem((ulong)lmb_alloc_base(lmb,
of_len, 0x1000, usable), of_len);
usable = min(start + size, low + mapsize);
addr = lmb_alloc_base(lmb, of_len, 0x1000, usable);
of_start = map_sysmem(addr, of_len);
/* Allocation succeeded, use this block. */
if (of_start != NULL)
break;
@ -233,7 +234,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
* Reduce the mapping size in the next bank
* by the size of attempt in current bank.
*/
mapsize -= usable - max(start, (u64)low);
mapsize -= usable - max(start, low);
if (!mapsize)
break;
}

2
include/image.h
View file

@ -946,7 +946,7 @@ static inline void image_set_name(struct legacy_img_hdr *hdr, const char *name)
int image_check_hcrc(const struct legacy_img_hdr *hdr);
int image_check_dcrc(const struct legacy_img_hdr *hdr);
#ifndef USE_HOSTCC
ulong env_get_bootm_low(void);
phys_addr_t env_get_bootm_low(void);
phys_size_t env_get_bootm_size(void);
phys_size_t env_get_bootm_mapsize(void);
#endif