GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 13:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPL: make struct spl_image 64-bit safe

Browse source 
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 <andre.przywara@arm.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
Andre Przywara 2017-01-02 11:48:31 +00:00 • committed by Jagan Teki
parent 2a6713b09b
commit 11e1479b9e
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-omap2/boot-common.c
View file

@ -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); 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 */ /* Pass the saved boot_params from rom code */
image_entry((u32 *)boot_params); image_entry((u32 *)boot_params);
} }

2
arch/arm/mach-tegra/spl.c
View file

@ -42,7 +42,7 @@ u32 spl_boot_device(void)
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) 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); start_cpu((u32)spl_image->entry_point);
halt_avp(); halt_avp();

8
common/spl/spl.c
View file

@ -115,7 +115,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
} }
spl_image->os = image_get_os(header); spl_image->os = image_get_os(header);
spl_image->name = image_get_name(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, (int)sizeof(spl_image->name), spl_image->name,
spl_image->load_addr, spl_image->size); spl_image->load_addr, spl_image->size);
} else { } 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->load_addr = CONFIG_SYS_LOAD_ADDR;
spl_image->entry_point = CONFIG_SYS_LOAD_ADDR; spl_image->entry_point = CONFIG_SYS_LOAD_ADDR;
spl_image->size = end - start; 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); spl_image->load_addr, spl_image->size);
return 0; 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); typedef void __noreturn (*image_entry_noargs_t)(void);
image_entry_noargs_t image_entry = 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(); image_entry();
} }

2
common/spl/spl_mmc.c
View file

@ -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 */ /* Read the header too to avoid extra memcpy */
count = blk_dread(mmc_get_blk_desc(mmc), sector, image_size_sectors, count = blk_dread(mmc_get_blk_desc(mmc), sector, image_size_sectors,
(void *)(ulong)spl_image->load_addr); (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); spl_image->load_addr);
if (count != image_size_sectors) if (count != image_size_sectors)
return -EIO; return -EIO;

4
include/spl.h
View file

@ -23,8 +23,8 @@
struct spl_image_info { struct spl_image_info {
const char *name; const char *name;
u8 os; u8 os;
u32 load_addr; ulong load_addr;
u32 entry_point; ulong entry_point;
u32 size; u32 size;
u32 flags; u32 flags;
}; };