Message ID | 20140810222116.GL19374@bill-the-cat |
---|---|
State | Not Applicable |
Delegated to: | Tom Rini |
Headers | show |
On Sun, Aug 10, 2014 at 3:21 PM, Tom Rini <trini@ti.com> wrote: > On Thu, Jul 31, 2014 at 05:39:58PM -0700, Bryan Wu wrote: > >> 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> > > After doing the following to fix warnings: > diff --git a/common/image.c b/common/image.c > index 4e2816a..a2999c0 100644 > --- a/common/image.c > +++ b/common/image.c > @@ -668,13 +668,13 @@ ulong genimg_get_kernel_addr(char * const img_addr) > load_addr); > #if defined(CONFIG_FIT) > } else if (fit_parse_conf(img_addr, load_addr, &kernel_addr, > - fit_uname_config)) { > + &fit_uname_config)) { My bad, thanks for fixing this. -Bryan > debug("* kernel: config '%s' from image at 0x%08lx\n", > - *fit_uname_config, kernel_addr); > + fit_uname_config, kernel_addr); > } else if (fit_parse_subimage(img_addr, load_addr, &kernel_addr, > - fit_uname_kernel)) { > + &fit_uname_kernel)) { > debug("* kernel: subimage '%s' from image at 0x%08lx\n", > - *fit_uname_kernel, kernel_addr); > + fit_uname_kernel, kernel_addr); > #endif > } else { > kernel_addr = simple_strtoul(img_addr, NULL, 16); > > Applied to u-boot/master, thanks! > > -- > Tom
diff --git a/common/image.c b/common/image.c index 4e2816a..a2999c0 100644 --- a/common/image.c +++ b/common/image.c @@ -668,13 +668,13 @@ ulong genimg_get_kernel_addr(char * const img_addr) load_addr); #if defined(CONFIG_FIT) } else if (fit_parse_conf(img_addr, load_addr, &kernel_addr, - fit_uname_config)) { + &fit_uname_config)) { debug("* kernel: config '%s' from image at 0x%08lx\n", - *fit_uname_config, kernel_addr); + fit_uname_config, kernel_addr); } else if (fit_parse_subimage(img_addr, load_addr, &kernel_addr, - fit_uname_kernel)) { + &fit_uname_kernel)) { debug("* kernel: subimage '%s' from image at 0x%08lx\n", - *fit_uname_kernel, kernel_addr); + fit_uname_kernel, kernel_addr); #endif } else { kernel_addr = simple_strtoul(img_addr, NULL, 16);