aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-06-06 09:47:17 -0400
committerTom Rini <trini@konsulko.com>2023-06-06 09:47:17 -0400
commitfadf83c86d7252df2b50ba526ffeea95658cb5b5 (patch)
treec86f5d29ab2ddad0886ec1f16b1486f774c30aff
parentd39277ff4210a1a3e07d40564a19c2e59cec04aa (diff)
parentb46cec41664f35c689385c70c76d274a059c7251 (diff)
downloadu-boot-fadf83c86d7252df2b50ba526ffeea95658cb5b5.zip
u-boot-fadf83c86d7252df2b50ba526ffeea95658cb5b5.tar.gz
u-boot-fadf83c86d7252df2b50ba526ffeea95658cb5b5.tar.bz2
Merge tag 'ubifixes-for-v2023-07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ubiWIP/06Jun2023
ubifs changes for v2023.07-rc4 UBIFS fixes from Ben Dooks - ubifs: allow loading to above 4GiB
-rw-r--r--cmd/ubifs.c4
-rw-r--r--fs/ubifs/ubifs.c4
-rw-r--r--include/ubifs_uboot.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 6a01d09..2a035bc 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -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) {
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index d3026e3..609bdbf 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -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) {
diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h
index b025779..db8a29e 100644
--- a/include/ubifs_uboot.h
+++ b/include/ubifs_uboot.h
@@ -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);