From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Date: Mon, 21 Nov 2016 16:48:17 +0100 Subject: [U-Boot] [PATCH 07/24] SPL: make struct spl_image 64-bit safe In-Reply-To: <1479653838-3574-8-git-send-email-andre.przywara@arm.com> References: <1479653838-3574-1-git-send-email-andre.przywara@arm.com> <1479653838-3574-8-git-send-email-andre.przywara@arm.com> Message-ID: <9634a8e2-0f40-ab82-c315-2612e8593631@suse.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 20/11/2016 15:57, Andre Przywara wrote: > Since entry_point and load_addr are addresses, they should be > represented as longs to cover the whole address space and to avoid > warning when compiling the SPL in 64-bit. > Also adjust debug prints to add the 'l' specifier, where needed. > > Signed-off-by: Andre Przywara I'm surprised York didn't stumble over this yet :). Reviewed-by: Alexander Graf Alex > --- > arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +- > arch/arm/mach-tegra/spl.c | 2 +- > common/spl/spl.c | 8 ++++---- > common/spl/spl_mmc.c | 2 +- > include/spl.h | 4 ++-- > 5 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c > index 385310b..7ae3d80 100644 > --- a/arch/arm/cpu/armv7/omap-common/boot-common.c > +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c > @@ -228,7 +228,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) > > u32 boot_params = *((u32 *)OMAP_SRAM_SCRATCH_BOOT_PARAMS); > > - debug("image entry point: 0x%X\n", spl_image->entry_point); > + debug("image entry point: 0x%lX\n", spl_image->entry_point); > /* Pass the saved boot_params from rom code */ > image_entry((u32 *)boot_params); > } > diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c > index e0f9d5b..41c88cb 100644 > --- a/arch/arm/mach-tegra/spl.c > +++ b/arch/arm/mach-tegra/spl.c > @@ -42,7 +42,7 @@ u32 spl_boot_device(void) > > void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) > { > - debug("image entry point: 0x%X\n", spl_image->entry_point); > + debug("image entry point: 0x%lX\n", spl_image->entry_point); > > start_cpu((u32)spl_image->entry_point); > halt_avp(); > diff --git a/common/spl/spl.c b/common/spl/spl.c > index bdb165a..835eed6 100644 > --- a/common/spl/spl.c > +++ b/common/spl/spl.c > @@ -115,7 +115,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, > } > spl_image->os = image_get_os(header); > spl_image->name = image_get_name(header); > - debug("spl: payload image: %.*s load addr: 0x%x size: %d\n", > + debug("spl: payload image: %.*s load addr: 0x%lx size: %d\n", > (int)sizeof(spl_image->name), spl_image->name, > spl_image->load_addr, spl_image->size); > } else { > @@ -140,7 +140,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, > spl_image->load_addr = CONFIG_SYS_LOAD_ADDR; > spl_image->entry_point = CONFIG_SYS_LOAD_ADDR; > spl_image->size = end - start; > - debug("spl: payload zImage, load addr: 0x%x size: %d\n", > + debug("spl: payload zImage, load addr: 0x%lx size: %d\n", > spl_image->load_addr, spl_image->size); > return 0; > } > @@ -164,9 +164,9 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) > typedef void __noreturn (*image_entry_noargs_t)(void); > > image_entry_noargs_t image_entry = > - (image_entry_noargs_t)(unsigned long)spl_image->entry_point; > + (image_entry_noargs_t)spl_image->entry_point; > > - debug("image entry point: 0x%X\n", spl_image->entry_point); > + debug("image entry point: 0x%lX\n", spl_image->entry_point); > image_entry(); > } > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index c674e61..4d0af2d 100644 > --- a/common/spl/spl_mmc.c > +++ b/common/spl/spl_mmc.c > @@ -36,7 +36,7 @@ static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc, > /* Read the header too to avoid extra memcpy */ > count = blk_dread(mmc_get_blk_desc(mmc), sector, image_size_sectors, > (void *)(ulong)spl_image->load_addr); > - debug("read %x sectors to %x\n", image_size_sectors, > + debug("read %x sectors to %lx\n", image_size_sectors, > spl_image->load_addr); > if (count != image_size_sectors) > return -EIO; > diff --git a/include/spl.h b/include/spl.h > index e080a82..2f8c052 100644 > --- a/include/spl.h > +++ b/include/spl.h > @@ -23,8 +23,8 @@ > struct spl_image_info { > const char *name; > u8 os; > - u32 load_addr; > - u32 entry_point; > + ulong load_addr; > + ulong entry_point; > u32 size; > u32 flags; > }; >