Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

boot: Drop size parameter from image_setup_libfdt()

Browse source 
The of_size parameter is not used, so remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2023-11-12 08:27:44 -07:00 • committed by Tom Rini
parent c659ac7cca
commit 1de1a03487
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/mips/lib/bootm.c
View file

@ -246,8 +246,8 @@ static int boot_setup_fdt(struct bootm_headers *images)
{ {
images->initrd_start = virt_to_phys((void *)images->initrd_start); images->initrd_start = virt_to_phys((void *)images->initrd_start);
images->initrd_end = virt_to_phys((void *)images->initrd_end); images->initrd_end = virt_to_phys((void *)images->initrd_end);
return image_setup_libfdt(images, images->ft_addr, images->ft_len,
&images->lmb); return image_setup_libfdt(images, images->ft_addr, &images->lmb);
} }
static void boot_prep_linux(struct bootm_headers *images) static void boot_prep_linux(struct bootm_headers *images)

2
boot/image-board.c
View file

@ -908,7 +908,7 @@ int image_setup_linux(struct bootm_headers *images)
} }
if (CONFIG_IS_ENABLED(OF_LIBFDT) && of_size) { if (CONFIG_IS_ENABLED(OF_LIBFDT) && of_size) {
ret = image_setup_libfdt(images, *of_flat_tree, of_size, lmb); ret = image_setup_libfdt(images, *of_flat_tree, lmb);
if (ret) if (ret)
return ret; return ret;
} }

3
boot/image-fdt.c
View file

@ -575,12 +575,13 @@ __weak int arch_fixup_fdt(void *blob)
} }
int image_setup_libfdt(struct bootm_headers *images, void *blob, int image_setup_libfdt(struct bootm_headers *images, void *blob,
int of_size, struct lmb *lmb) struct lmb *lmb)
{ {
ulong *initrd_start = &images->initrd_start; ulong *initrd_start = &images->initrd_start;
ulong *initrd_end = &images->initrd_end; ulong *initrd_end = &images->initrd_end;
int ret = -EPERM; int ret = -EPERM;
int fdt_ret; int fdt_ret;
int of_size;
if (fdt_root(blob) < 0) { if (fdt_root(blob) < 0) {
printf("ERROR: root node setup failed\n"); printf("ERROR: root node setup failed\n");

2
cmd/bootefi.c
View file

@ -309,7 +309,7 @@ efi_status_t efi_install_fdt(void *fdt)
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
if (image_setup_libfdt(&img, fdt, 0, NULL)) { if (image_setup_libfdt(&img, fdt, NULL)) {
log_err("ERROR: failed to process device tree\n"); log_err("ERROR: failed to process device tree\n");
return EFI_LOAD_ERROR; return EFI_LOAD_ERROR;
} }

3
include/image.h
View file

@ -1028,12 +1028,11 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
* *
* @images: Images information * @images: Images information
* @blob: FDT to update * @blob: FDT to update
* @of_size: Size of the FDT
* @lmb: Points to logical memory block structure * @lmb: Points to logical memory block structure
* Return: 0 if ok, <0 on failure * Return: 0 if ok, <0 on failure
*/ */
int image_setup_libfdt(struct bootm_headers *images, void *blob, int image_setup_libfdt(struct bootm_headers *images, void *blob,
int of_size, struct lmb *lmb); struct lmb *lmb);
/** /**
* Set up the FDT to use for booting a kernel * Set up the FDT to use for booting a kernel

2
lib/efi_loader/efi_dt_fixup.c
View file

@ -173,7 +173,7 @@ efi_dt_fixup(struct efi_dt_fixup_protocol *this, void *dtb,
} }
fdt_set_totalsize(dtb, *buffer_size); fdt_set_totalsize(dtb, *buffer_size);
if (image_setup_libfdt(&img, dtb, 0, NULL)) { if (image_setup_libfdt(&img, dtb, NULL)) {
log_err("failed to process device tree\n"); log_err("failed to process device tree\n");
ret = EFI_INVALID_PARAMETER; ret = EFI_INVALID_PARAMETER;
goto out; goto out;