[U-Boot] [RFC PATCH v5 1/4] common: Convert ulong to phys_addr_t for image addresses
York Sun
york.sun at nxp.com
Thu Feb 25 23:36:16 CET 2016
When dealing with image addresses, ulong has been used. Some files
are used by both host and target. It is OK for the target, but not
always enough for host tools including mkimage. This patch replaces
"ulong" with "phys_addr_t" to make sure addresses are correct for
both the target and the host.
This issue was found on 32-bit host when compiling for 64-bit target
to support images with address higher than 32-bit space.
Signed-off-by: York Sun <york.sun at nxp.com>
---
Changes in v5:
Add comment to explain casting from 64-bit to 32-bit on 32-bit
targets with 36-bit or more physical address space
Revert a change of using pointer in bootm_host_load_image()
Using new PRIpa macro instead of casting in fit_image_load()
Add change to arch/x86/lib/bootm.c
Changes in v4:
New patch, separated from fixing FIT image.
Changes in v3: None
Changes in v2: None
arch/powerpc/lib/bootm.c | 4 ++--
arch/x86/lib/bootm.c | 15 +++++++++------
cmd/bootm.c | 11 ++++++-----
cmd/ximg.c | 21 +++++++++++++++------
common/bootm.c | 21 +++++++++++----------
common/bootm_os.c | 14 ++++++++------
common/image-android.c | 10 +++++-----
common/image-fdt.c | 16 ++++++++--------
common/image-fit.c | 25 +++++++++++++------------
common/image.c | 17 ++++++++++-------
include/bootm.h | 6 +++---
include/image.h | 40 +++++++++++++++++++++++++++-------------
tools/default_image.c | 2 +-
13 files changed, 118 insertions(+), 84 deletions(-)
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index ef15e7a..794382a 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -47,7 +47,7 @@ static void boot_jump_linux(bootm_headers_t *images)
#endif
kernel = (void (*)(bd_t *, ulong, ulong, ulong,
- ulong, ulong, ulong))images->ep;
+ ulong, ulong, ulong))(uintptr_t)images->ep;
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
@@ -335,7 +335,7 @@ void boot_jump_vxworks(bootm_headers_t *images)
WATCHDOG_RESET();
((void (*)(void *, ulong, ulong, ulong,
- ulong, ulong, ulong))images->ep)(images->ft_addr,
+ ulong, ulong, ulong))(uintptr_t)images->ep)(images->ft_addr,
0, 0, EPAPR_MAGIC, getenv_bootm_mapsize(), 0, 0);
}
#endif
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 783be69..51b49c2 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -71,6 +71,8 @@ static int boot_prep_linux(bootm_headers_t *images)
char *cmd_line_dest = NULL;
image_header_t *hdr;
int is_zimage = 0;
+ phys_addr_t os_data;
+ ulong os_len;
void *data = NULL;
size_t len;
int ret;
@@ -87,11 +89,10 @@ static int boot_prep_linux(bootm_headers_t *images)
if (images->legacy_hdr_valid) {
hdr = images->legacy_hdr_os;
if (image_check_type(hdr, IH_TYPE_MULTI)) {
- ulong os_data, os_len;
/* if multi-part image, we need to get first subimage */
image_multi_getimg(hdr, 0, &os_data, &os_len);
- data = (void *)os_data;
+ data = (void *)(uintptr_t)os_data;
len = os_len;
} else {
/* otherwise get image data */
@@ -121,14 +122,15 @@ static int boot_prep_linux(bootm_headers_t *images)
cmd_line_dest = base_ptr + COMMAND_LINE_OFFSET;
images->ep = (ulong)base_ptr;
} else if (images->ep) {
- cmd_line_dest = (void *)images->ep + COMMAND_LINE_OFFSET;
+ cmd_line_dest = (void *)(uintptr_t)images->ep +
+ COMMAND_LINE_OFFSET;
} else {
printf("## Kernel loading failed (missing x86 kernel setup) ...\n");
goto error;
}
- printf("Setup at %#08lx\n", images->ep);
- ret = setup_zimage((void *)images->ep, cmd_line_dest,
+ printf("Setup at %#08" PRIpa "\n", images->ep);
+ ret = setup_zimage((void *)(uintptr_t)images->ep, cmd_line_dest,
0, images->rd_start,
images->rd_end - images->rd_start);
@@ -187,7 +189,8 @@ int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit)
/* Subcommand: GO */
static int boot_jump_linux(bootm_headers_t *images)
{
- debug("## Transferring control to Linux (at address %08lx, kernel %08lx) ...\n",
+ debug("## Transferring control to Linux (at address %#08" PRIpa
+ ", kernel %#08" PRIpa ") ...\n",
images->ep, images->os.load);
return boot_linux_kernel(images->ep, images->os.load,
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 48738ac..304567d 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -566,8 +566,8 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
load_addr);
} else {
images->ep = simple_strtoul(argv[0], NULL, 16);
- debug("* kernel: cmdline image address = 0x%08lx\n",
- images->ep);
+ debug("* kernel: cmdline image address = %#08" PRIpa "\n",
+ images->ep);
}
ret = bootz_setup(images->ep, &zi_start, &zi_end);
@@ -676,7 +676,8 @@ static int booti_setup(bootm_headers_t *images)
if (images->ep != dst) {
void *src;
- debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst);
+ debug("Moving Image from 0x%" PRIpa " to 0x%llx\n",
+ images->ep, dst);
src = (void *)images->ep;
images->ep = dst;
@@ -705,8 +706,8 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
load_addr);
} else {
images->ep = simple_strtoul(argv[0], NULL, 16);
- debug("* kernel: cmdline image address = 0x%08lx\n",
- images->ep);
+ debug("* kernel: cmdline image address = %#08" PRIpa "\n",
+ images->ep);
}
ret = booti_setup(images);
diff --git a/cmd/ximg.c b/cmd/ximg.c
index d033c15..358067a 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -33,7 +33,16 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{
ulong addr = load_addr;
ulong dest = 0;
- ulong data, len;
+ /*
+ * In this function, data is decalred as phys_addr_t type.
+ * On some systems (eg. ARM, PowerPC) phys_addr_t can be
+ * "unsigned long", or "unsigned long long", depending on
+ * CONFIG_PHYS_64BIT. It is safe to cast 64-bit phys_addr_t
+ * to 32-bit pointer for image handling because the actual
+ * address the image is loaded is within 32-bit space.
+ */
+ phys_addr_t data;
+ ulong len;
int verify;
int part = 0;
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
@@ -173,7 +182,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
return 1;
}
- data = (ulong)fit_data;
+ data = (phys_addr_t)(uintptr_t)fit_data;
len = (ulong)fit_len;
break;
#endif
@@ -190,7 +199,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
size_t l = len;
size_t tail;
void *to = (void *) dest;
- void *from = (void *)data;
+ void *from = (void *)(uintptr_t)data;
printf(" Loading part %d ... ", part);
@@ -205,14 +214,14 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
}
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
printf(" Loading part %d ... ", part);
- memmove((char *) dest, (char *)data, len);
+ memmove((char *)dest, (char *)(uintptr_t)data, len);
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
break;
#ifdef CONFIG_GZIP
case IH_COMP_GZIP:
printf(" Uncompressing part %d ... ", part);
if (gunzip((void *) dest, unc_len,
- (uchar *) data, &len) != 0) {
+ (uchar *)(uintptr_t)data, &len) != 0) {
puts("GUNZIP ERROR - image not loaded\n");
return 1;
}
@@ -231,7 +240,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
*/
i = BZ2_bzBuffToBuffDecompress(
map_sysmem(ntohl(hdr->ih_load), 0),
- &unc_len, (char *)data, len,
+ &unc_len, (char *)(uintptr_t)data, len,
CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
0);
if (i != BZ_OK) {
diff --git a/common/bootm.c b/common/bootm.c
index 99d574d..0086407 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -43,7 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[], bootm_headers_t *images,
- ulong *os_data, ulong *os_len);
+ phys_addr_t *os_data, ulong *os_len);
#ifdef CONFIG_LMB
static void boot_start_lmb(bootm_headers_t *images)
@@ -325,9 +325,9 @@ static int handle_decomp_error(int comp_type, size_t uncomp_size,
return BOOTM_ERR_RESET;
}
-int bootm_decomp_image(int comp, ulong load, ulong image_start, int type,
- void *load_buf, void *image_buf, ulong image_len,
- uint unc_len, ulong *load_end)
+int bootm_decomp_image(int comp, phys_addr_t load, phys_addr_t image_start,
+ int type, void *load_buf, void *image_buf,
+ ulong image_len, uint unc_len, ulong *load_end)
{
int ret = 0;
@@ -767,7 +767,7 @@ static image_header_t *image_get_kernel(ulong img_addr, int verify)
/**
* boot_get_kernel - find kernel image
- * @os_data: pointer to a ulong variable, will hold os data start address
+ * @os_data: pointer to a phys_addr_t variable, will hold os data start address
* @os_len: pointer to a ulong variable, will hold os data length
*
* boot_get_kernel() tries to find a kernel image, verifies its integrity
@@ -779,7 +779,7 @@ static image_header_t *image_get_kernel(ulong img_addr, int verify)
*/
static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[], bootm_headers_t *images,
- ulong *os_data, ulong *os_len)
+ phys_addr_t *os_data, ulong *os_len)
{
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
image_header_t *hdr;
@@ -879,7 +879,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
return NULL;
}
- debug(" kernel data at 0x%08lx, len = 0x%08lx (%ld)\n",
+ debug(" kernel data at %#08" PRIpa ", len = 0x%08lx (%ld)\n",
*os_data, *os_len, *os_len);
return buf;
@@ -894,7 +894,8 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
static int bootm_host_load_image(const void *fit, int req_image_type)
{
const char *fit_uname_config = NULL;
- ulong data, len;
+ phys_addr_t data;
+ ulong len;
bootm_headers_t images;
int noffset;
ulong load_end;
@@ -924,8 +925,8 @@ static int bootm_host_load_image(const void *fit, int req_image_type)
/* Allow the image to expand by a factor of 4, should be safe */
load_buf = malloc((1 << 20) + len * 4);
ret = bootm_decomp_image(imape_comp, 0, data, image_type, load_buf,
- (void *)data, len, CONFIG_SYS_BOOTM_LEN,
- &load_end);
+ (void *)(uintptr_t)data, len,
+ CONFIG_SYS_BOOTM_LEN, &load_end);
free(load_buf);
if (ret && ret != BOOTM_ERR_UNIMPLEMENTED)
diff --git a/common/bootm_os.c b/common/bootm_os.c
index cb83f4a..07d28bd 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -26,7 +26,7 @@ static int do_bootm_standalone(int flag, int argc, char * const argv[],
setenv_hex("filesize", images->os.image_len);
return 0;
}
- appl = (int (*)(int, char * const []))images->ep;
+ appl = (int (*)(int, char * const []))(uintptr_t)images->ep;
appl(argc, argv);
return 0;
}
@@ -55,7 +55,8 @@ static int do_bootm_netbsd(int flag, int argc, char * const argv[],
{
void (*loader)(bd_t *, image_header_t *, char *, char *);
image_header_t *os_hdr, *hdr;
- ulong kernel_data, kernel_len;
+ phys_addr_t kernel_data;
+ ulong kernel_len;
char *consdev;
char *cmdline;
@@ -113,7 +114,8 @@ static int do_bootm_netbsd(int flag, int argc, char * const argv[],
cmdline = "";
}
- loader = (void (*)(bd_t *, image_header_t *, char *, char *))images->ep;
+ loader = (void (*)(bd_t *, image_header_t *, char *, char *))
+ (uintptr_t)images->ep;
printf("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
(ulong)loader);
@@ -171,7 +173,7 @@ static int do_bootm_rtems(int flag, int argc, char * const argv[],
}
#endif
- entry_point = (void (*)(bd_t *))images->ep;
+ entry_point = (void (*)(bd_t *))(uintptr_t)images->ep;
printf("## Transferring control to RTEMS (at address %08lx) ...\n",
(ulong)entry_point);
@@ -252,7 +254,7 @@ static int do_bootm_plan9(int flag, int argc, char * const argv[],
}
}
- entry_point = (void (*)(void))images->ep;
+ entry_point = (void (*)(void))(uintptr_t)images->ep;
printf("## Transferring control to Plan 9 (at address %08lx) ...\n",
(ulong)entry_point);
@@ -364,7 +366,7 @@ static int do_bootm_qnxelf(int flag, int argc, char * const argv[],
}
#endif
- sprintf(str, "%lx", images->ep); /* write entry-point into string */
+ sprintf(str, "%" PRIpa, images->ep); /* write entry-point into string */
local_args[0] = argv[0];
local_args[1] = str; /* and provide it via the arguments */
do_bootelf(NULL, 0, 2, local_args);
diff --git a/common/image-android.c b/common/image-android.c
index b6a94b3..a82b95d 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -38,7 +38,7 @@ static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr)
* @hdr: Pointer to image header, which is at the start
* of the image.
* @verify: Checksum verification flag. Currently unimplemented.
- * @os_data: Pointer to a ulong variable, will hold os data start
+ * @os_data: Pointer to a phys_addr_t variable, will hold os data start
* address.
* @os_len: Pointer to a ulong variable, will hold os data length.
*
@@ -49,7 +49,7 @@ static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr)
* otherwise on failure.
*/
int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
- ulong *os_data, ulong *os_len)
+ phys_addr_t *os_data, ulong *os_len)
{
u32 kernel_addr = android_image_get_kernel_addr(hdr);
@@ -93,7 +93,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
setenv("bootargs", newbootargs);
if (os_data) {
- *os_data = (ulong)hdr;
+ *os_data = (phys_addr_t)hdr;
*os_data += hdr->page_size;
}
if (os_len)
@@ -128,7 +128,7 @@ ulong android_image_get_kload(const struct andr_img_hdr *hdr)
}
int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
- ulong *rd_data, ulong *rd_len)
+ phys_addr_t *rd_data, ulong *rd_len)
{
if (!hdr->ramdisk_size) {
*rd_data = *rd_len = 0;
@@ -138,7 +138,7 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
printf("RAM disk load addr 0x%08x size %u KiB\n",
hdr->ramdisk_addr, DIV_ROUND_UP(hdr->ramdisk_size, 1024));
- *rd_data = (unsigned long)hdr;
+ *rd_data = (phys_addr_t)hdr;
*rd_data += hdr->page_size;
*rd_data += ALIGN(hdr->kernel_size, hdr->page_size);
diff --git a/common/image-fdt.c b/common/image-fdt.c
index 79fa655..cc5c936 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -223,11 +223,14 @@ error:
int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
bootm_headers_t *images, char **of_flat_tree, ulong *of_size)
{
+ phys_addr_t load;
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
const image_header_t *fdt_hdr;
- ulong load, load_end;
+ phys_addr_t load_end;
ulong image_start, image_data, image_end;
#endif
+ phys_addr_t fdt_data;
+ ulong fdt_len;
ulong fdt_addr;
char *fdt_blob = NULL;
void *buf;
@@ -236,6 +239,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
const char *fit_uname_fdt = NULL;
ulong default_addr;
int fdt_noffset;
+ ulong len;
#endif
const char *select = NULL;
int ok_no_fdt = 0;
@@ -335,10 +339,10 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
goto error;
}
- debug(" Loading FDT from 0x%08lx to 0x%08lx\n",
+ debug(" Loading FDT from 0x%08lx to %#08" PRIpa "\n",
image_data, load);
- memmove((void *)load,
+ memmove((void *)(uintptr_t)load,
(void *)image_data,
image_get_data_size(fdt_hdr));
@@ -354,8 +358,6 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
#if defined(CONFIG_FIT)
/* check FDT blob vs FIT blob */
if (fit_check_format(buf)) {
- ulong load, len;
-
fdt_noffset = fit_image_load(images,
fdt_addr, &fit_uname_fdt,
&fit_uname_config,
@@ -389,8 +391,6 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
} else if (images->legacy_hdr_valid &&
image_check_type(&images->legacy_hdr_os_copy,
IH_TYPE_MULTI)) {
- ulong fdt_data, fdt_len;
-
/*
* Now check if we have a legacy multi-component image,
* get second entry data start address and len.
@@ -401,7 +401,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
image_multi_getimg(images->legacy_hdr_os, 2, &fdt_data,
&fdt_len);
if (fdt_len) {
- fdt_blob = (char *)fdt_data;
+ fdt_blob = (char *)(uintptr_t)fdt_data;
printf(" Booting using the fdt at 0x%p\n", fdt_blob);
if (fdt_check_header(fdt_blob) != 0) {
diff --git a/common/image-fit.c b/common/image-fit.c
index c531ee7..eec0ded 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -358,7 +358,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
char *desc;
uint8_t type, arch, os, comp;
size_t size;
- ulong load, entry;
+ phys_addr_t load, entry;
const void *data;
int noffset;
int ndepth;
@@ -428,7 +428,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
if (ret)
printf("unavailable\n");
else
- printf("0x%08lx\n", load);
+ printf("%#08" PRIpa "\n", load);
}
if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) ||
@@ -438,7 +438,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
if (ret)
printf("unavailable\n");
else
- printf("0x%08lx\n", entry);
+ printf("%#08" PRIpa "\n", entry);
}
/* Process all hash subnodes of the component image node */
@@ -679,7 +679,7 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp)
* fit_image_get_load() - get load addr property for given component image node
* @fit: pointer to the FIT format image header
* @noffset: component image node offset
- * @load: pointer to the uint32_t, will hold load address
+ * @load: pointer to the phys_addr_t, will hold load address
*
* fit_image_get_load() finds load address property in a given component
* image node. If the property is found, its value is returned to the caller.
@@ -688,7 +688,7 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp)
* 0, on success
* -1, on failure
*/
-int fit_image_get_load(const void *fit, int noffset, ulong *load)
+int fit_image_get_load(const void *fit, int noffset, phys_addr_t *load)
{
int len;
const uint32_t *data;
@@ -707,7 +707,7 @@ int fit_image_get_load(const void *fit, int noffset, ulong *load)
* fit_image_get_entry() - get entry point address property
* @fit: pointer to the FIT format image header
* @noffset: component image node offset
- * @entry: pointer to the uint32_t, will hold entry point address
+ * @entry: pointer to the phys_addr_t, will hold entry point address
*
* This gets the entry point address property for a given component image
* node.
@@ -720,7 +720,7 @@ int fit_image_get_load(const void *fit, int noffset, ulong *load)
* 0, on success
* -1, on failure
*/
-int fit_image_get_entry(const void *fit, int noffset, ulong *entry)
+int fit_image_get_entry(const void *fit, int noffset, phys_addr_t *entry)
{
int len;
const uint32_t *data;
@@ -1556,7 +1556,7 @@ static const char *fit_get_image_type_property(int type)
int fit_image_load(bootm_headers_t *images, ulong addr,
const char **fit_unamep, const char **fit_uname_configp,
int arch, int image_type, int bootstage_id,
- enum fit_load_op load_op, ulong *datap, ulong *lenp)
+ enum fit_load_op load_op, phys_addr_t *datap, ulong *lenp)
{
int cfg_noffset, noffset;
const char *fit_uname;
@@ -1565,7 +1565,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
const void *buf;
size_t size;
int type_ok, os_ok;
- ulong load, data, len;
+ phys_addr_t load;
+ ulong data, len;
uint8_t os;
const char *prop_name;
int ret;
@@ -1721,7 +1722,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
}
} else if (load_op != FIT_LOAD_OPTIONAL_NON_ZERO || load) {
ulong image_start, image_end;
- ulong load_end;
+ phys_addr_t load_end;
void *dst;
/*
@@ -1738,7 +1739,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
return -EXDEV;
}
- printf(" Loading %s from 0x%08lx to 0x%08lx\n",
+ printf(" Loading %s from 0x%08lx to %#08" PRIpa "\n",
prop_name, data, load);
dst = map_sysmem(load, len);
@@ -1758,7 +1759,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
}
int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch,
- ulong *setup_start, ulong *setup_len)
+ phys_addr_t *setup_start, ulong *setup_len)
{
int noffset;
ulong addr;
diff --git a/common/image.c b/common/image.c
index 1d7543d..cbd0970 100644
--- a/common/image.c
+++ b/common/image.c
@@ -232,7 +232,7 @@ ulong image_multi_count(const image_header_t *hdr)
* image_multi_getimg - get component data address and size
* @hdr: pointer to the header of the multi component image
* @idx: index of the requested component
- * @data: pointer to a ulong variable, will hold component data address
+ * @data: pointer to a phys_addr_t variable, will hold component data address
* @len: pointer to a ulong variable, will hold component size
*
* image_multi_getimg() returns size and data address for the requested
@@ -246,7 +246,7 @@ ulong image_multi_count(const image_header_t *hdr)
* 0 in data and len, if idx is out of range
*/
void image_multi_getimg(const image_header_t *hdr, ulong idx,
- ulong *data, ulong *len)
+ phys_addr_t *data, ulong *len)
{
int i;
uint32_t *size;
@@ -326,7 +326,8 @@ void image_print_contents(const void *ptr)
if (image_check_type(hdr, IH_TYPE_MULTI) ||
image_check_type(hdr, IH_TYPE_SCRIPT)) {
int i;
- ulong data, len;
+ phys_addr_t data;
+ ulong len;
ulong count = image_multi_count(hdr);
printf("%sContents:\n", p);
@@ -342,7 +343,7 @@ void image_print_contents(const void *ptr)
* if planning to do something with
* multiple files
*/
- printf("%s Offset = 0x%08lx\n", p, data);
+ printf("%s Offset = %#08" PRIpa, p, data);
}
}
}
@@ -895,7 +896,8 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
uint8_t arch, ulong *rd_start, ulong *rd_end)
{
ulong rd_addr, rd_load;
- ulong rd_data, rd_len;
+ phys_addr_t rd_data;
+ ulong rd_len;
#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
const image_header_t *rd_hdr;
#endif
@@ -1182,7 +1184,7 @@ error:
#endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */
int boot_get_setup(bootm_headers_t *images, uint8_t arch,
- ulong *setup_start, ulong *setup_len)
+ phys_addr_t *setup_start, ulong *setup_len)
{
#if defined(CONFIG_FIT)
return boot_get_setup_fit(images, arch, setup_start, setup_len);
@@ -1204,7 +1206,8 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images,
* These two variables are requirements for fit_image_load, but
* their values are not used
*/
- ulong img_data, img_len;
+ phys_addr_t img_data;
+ ulong img_len;
void *buf;
int loadables_index;
int conf_noffset;
diff --git a/include/bootm.h b/include/bootm.h
index 4981377..f280ace 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -69,8 +69,8 @@ void arch_preboot_os(void);
* @unc_len: Available space for decompression
* @return 0 if OK, -ve on error (BOOTM_ERR_...)
*/
-int bootm_decomp_image(int comp, ulong load, ulong image_start, int type,
- void *load_buf, void *image_buf, ulong image_len,
- uint unc_len, ulong *load_end);
+int bootm_decomp_image(int comp, phys_addr_t load, phys_addr_t image_start,
+ int type, void *load_buf, void *image_buf,
+ ulong image_len, uint unc_len, ulong *load_end);
#endif
diff --git a/include/image.h b/include/image.h
index 299d6d2..18b9516 100644
--- a/include/image.h
+++ b/include/image.h
@@ -33,11 +33,24 @@ struct lmb;
#define IMAGE_ENABLE_IGNORE 0
#define IMAGE_INDENT_STRING ""
+/* Be able to hold physical address */
+typedef unsigned long long phys_addr_t;
+typedef unsigned long long phys_size_t;
+#define PRIpa "llx"
+
#else
#include <lmb.h>
#include <asm/u-boot.h>
#include <command.h>
+#include <linux/types.h>
+#if defined(CONFIG_PHYS_64BIT) || \
+ (BITS_PER_LONG > 32) || \
+ defined(CONFIG_X86)
+#define PRIpa "llx"
+#else
+#define PRIpa "lx"
+#endif
/* Take notice of the 'ignore' property for hashes */
#define IMAGE_ENABLE_IGNORE 1
@@ -288,9 +301,10 @@ typedef struct image_header {
} image_header_t;
typedef struct image_info {
- ulong start, end; /* start/end of blob */
- ulong image_start, image_len; /* start of image within blob, len of image */
- ulong load; /* load addr for the image */
+ phys_addr_t start, end; /* start/end of blob */
+ phys_addr_t image_start; /* start of image within blob */
+ ulong image_len; /* len of image */
+ phys_addr_t load; /* load addr for the image */
uint8_t comp, type, os; /* compression, type of image, os type */
uint8_t arch; /* CPU architecture */
} image_info_t;
@@ -331,7 +345,7 @@ typedef struct bootm_headers {
#ifndef USE_HOSTCC
image_info_t os; /* os image info */
- ulong ep; /* entry point of OS */
+ phys_addr_t ep; /* entry point of OS */
ulong rd_start, rd_end;/* ramdisk start/end */
@@ -450,8 +464,8 @@ enum fit_load_op {
FIT_LOAD_REQUIRED, /* Must be provided */
};
-int boot_get_setup(bootm_headers_t *images, uint8_t arch, ulong *setup_start,
- ulong *setup_len);
+int boot_get_setup(bootm_headers_t *images, uint8_t arch,
+ phys_addr_t *setup_start, ulong *setup_len);
#ifndef USE_HOSTCC
/* Image format types, returned by _get_format() routine */
@@ -499,7 +513,7 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images,
#endif /* !USE_HOSTCC */
int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch,
- ulong *setup_start, ulong *setup_len);
+ phys_addr_t *setup_start, ulong *setup_len);
/**
* fit_image_load() - load an image from a FIT
@@ -534,7 +548,7 @@ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch,
int fit_image_load(bootm_headers_t *images, ulong addr,
const char **fit_unamep, const char **fit_uname_configp,
int arch, int image_type, int bootstage_id,
- enum fit_load_op load_op, ulong *datap, ulong *lenp);
+ enum fit_load_op load_op, phys_addr_t *datap, ulong *lenp);
#ifndef USE_HOSTCC
/**
@@ -703,7 +717,7 @@ static inline int image_check_os(const image_header_t *hdr, uint8_t os)
ulong image_multi_count(const image_header_t *hdr);
void image_multi_getimg(const image_header_t *hdr, ulong idx,
- ulong *data, ulong *len);
+ phys_addr_t *data, ulong *len);
void image_print_contents(const void *hdr);
@@ -845,8 +859,8 @@ int fit_image_get_os(const void *fit, int noffset, uint8_t *os);
int fit_image_get_arch(const void *fit, int noffset, uint8_t *arch);
int fit_image_get_type(const void *fit, int noffset, uint8_t *type);
int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp);
-int fit_image_get_load(const void *fit, int noffset, ulong *load);
-int fit_image_get_entry(const void *fit, int noffset, ulong *entry);
+int fit_image_get_load(const void *fit, int noffset, phys_addr_t *load);
+int fit_image_get_entry(const void *fit, int noffset, phys_addr_t *entry);
int fit_image_get_data(const void *fit, int noffset,
const void **data, size_t *size);
@@ -1122,9 +1136,9 @@ static inline int fit_image_check_target_arch(const void *fdt, int node)
struct andr_img_hdr;
int android_image_check_header(const struct andr_img_hdr *hdr);
int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
- ulong *os_data, ulong *os_len);
+ phys_addr_t *os_data, ulong *os_len);
int android_image_get_ramdisk(const struct andr_img_hdr *hdr,
- ulong *rd_data, ulong *rd_len);
+ phys_addr_t *rd_data, ulong *rd_len);
ulong android_image_get_end(const struct andr_img_hdr *hdr);
ulong android_image_get_kload(const struct andr_img_hdr *hdr);
diff --git a/tools/default_image.c b/tools/default_image.c
index 3ed7014..ecb77f4 100644
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -134,7 +134,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd,
static int image_extract_subimage(void *ptr, struct image_tool_params *params)
{
const image_header_t *hdr = (const image_header_t *)ptr;
- ulong file_data;
+ phys_addr_t file_data;
ulong file_len;
if (image_check_type(hdr, IH_TYPE_MULTI)) {
--
1.7.9.5
More information about the U-Boot
mailing list