mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 00:20:44 +09:00
image: introduce genimg_get_kernel_addr()
Kernel address is normally stored as a string argument of bootm or bootz. This function is taken out from boot_get_kernel() of bootm.c, which can be reused by others. Signed-off-by: Bryan Wu <pengw@nvidia.com> [trini: Fix warnings with CONFIG_FIT] Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
parent
68dc8769e3
commit
0f64140b69
@ -642,6 +642,49 @@ int genimg_get_comp_id(const char *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef USE_HOSTCC
|
#ifndef USE_HOSTCC
|
||||||
|
/**
|
||||||
|
* genimg_get_kernel_addr - get the real kernel address
|
||||||
|
* @img_addr: a string might contain real image address
|
||||||
|
*
|
||||||
|
* genimg_get_kernel_addr() get the real kernel start address from a string
|
||||||
|
* which is normally the first argv of bootm/bootz
|
||||||
|
*
|
||||||
|
* returns:
|
||||||
|
* kernel start address
|
||||||
|
*/
|
||||||
|
ulong genimg_get_kernel_addr(char * const img_addr)
|
||||||
|
{
|
||||||
|
#if defined(CONFIG_FIT)
|
||||||
|
const char *fit_uname_config = NULL;
|
||||||
|
const char *fit_uname_kernel = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ulong kernel_addr;
|
||||||
|
|
||||||
|
/* find out kernel image address */
|
||||||
|
if (!img_addr) {
|
||||||
|
kernel_addr = load_addr;
|
||||||
|
debug("* kernel: default image load address = 0x%08lx\n",
|
||||||
|
load_addr);
|
||||||
|
#if defined(CONFIG_FIT)
|
||||||
|
} else if (fit_parse_conf(img_addr, load_addr, &kernel_addr,
|
||||||
|
&fit_uname_config)) {
|
||||||
|
debug("* kernel: config '%s' from image at 0x%08lx\n",
|
||||||
|
fit_uname_config, kernel_addr);
|
||||||
|
} else if (fit_parse_subimage(img_addr, load_addr, &kernel_addr,
|
||||||
|
&fit_uname_kernel)) {
|
||||||
|
debug("* kernel: subimage '%s' from image at 0x%08lx\n",
|
||||||
|
fit_uname_kernel, kernel_addr);
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
kernel_addr = simple_strtoul(img_addr, NULL, 16);
|
||||||
|
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||||
|
kernel_addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
return kernel_addr;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* genimg_get_format - get image format type
|
* genimg_get_format - get image format type
|
||||||
* @img_addr: image start address
|
* @img_addr: image start address
|
||||||
|
@ -424,6 +424,7 @@ enum fit_load_op {
|
|||||||
#define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */
|
#define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */
|
||||||
#define IMAGE_FORMAT_ANDROID 0x03 /* Android boot image */
|
#define IMAGE_FORMAT_ANDROID 0x03 /* Android boot image */
|
||||||
|
|
||||||
|
ulong genimg_get_kernel_addr(char * const img_addr);
|
||||||
int genimg_get_format(const void *img_addr);
|
int genimg_get_format(const void *img_addr);
|
||||||
int genimg_has_config(bootm_headers_t *images);
|
int genimg_has_config(bootm_headers_t *images);
|
||||||
ulong genimg_get_image(ulong img_addr);
|
ulong genimg_get_image(ulong img_addr);
|
||||||
|
Loading…
Reference in New Issue
Block a user