Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-18 06:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'ubifixes-for-v2023-07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ubi

Browse source 
ubifs changes for v2023.07-rc4

UBIFS fixes from Ben Dooks

- ubifs: allow loading to above 4GiB
This commit is contained in:
Tom Rini 2023-06-06 09:47:17 -04:00
commit fadf83c86d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/ubifs.c
View file

@ -111,7 +111,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
char *filename;
char *endp;
int ret;
u32 addr;
unsigned long addr;
u32 size = 0;
if (!ubifs_mounted) {
@ -133,7 +133,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
if (endp == argv[3])
return CMD_RET_USAGE;
}
debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
debug("Loading file '%s' to address 0x%08lx (size %d)\n", filename, addr, size);
ret = ubifs_load(filename, addr, size);
if (ret) {

4
fs/ubifs/ubifs.c
View file

@ -925,12 +925,12 @@ void ubifs_close(void)
}
/* Compat wrappers for common/cmd_ubifs.c */
int ubifs_load(char *filename, u32 addr, u32 size)
int ubifs_load(char *filename, unsigned long addr, u32 size)
{
loff_t actread;
int err;
printf("Loading file '%s' to addr 0x%08x...\n", filename, addr);
printf("Loading file '%s' to addr 0x%08lx...\n", filename, addr);
err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread);
if (err == 0) {

2
include/ubifs_uboot.h
View file

@ -21,7 +21,7 @@ int ubifs_init(void);
int uboot_ubifs_mount(char *vol_name);
void uboot_ubifs_umount(void);
int ubifs_is_mounted(void);
int ubifs_load(char *filename, u32 addr, u32 size);
int ubifs_load(char *filename, unsigned long addr, u32 size);
int ubifs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info);
int ubifs_ls(const char *dir_name);