[U-Boot] [PATCH v2 3/3] bootm: use genimg_get_kernel_addr()

Bryan Wu
2014-08-15T04:02:37Z

On Thu, Aug 14, 2014 at 8:48 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi York,
>
> On 14 August 2014 19:42, York Sun <yorksun@freescale.com> wrote:
>> Tom,
>>
>> I tested with "bootm 806f0000". My FIT image is loaded there. I don't have
>> load_addr variable. My default load_addr (from CONFIG macro) is different
>> from this address.
>
> Yes unfortunately this is completely wrong. I did not catch this in my
> review unfortunately, perhaps because the & was removed in the code I
> reviewed.
>
> fit_uname_config and fit_uname_kernel must be passed back from
> genimg_get_kernel_addr() - that function will need two new parameters.
>

I'm working on a fix to add this 2 new parameters.

-Bryan

>
>>
>> York
>>
>> ________________________________
>> From: Tom Rini
>> Sent: Thu, 14/08/2014 18:38
>> To: Sun York-R58495 <yorksun@freescale.com>
>> CC: Bryan Wu <cooloney@gmail.com>; sjg at chromium.org; swarren at wwwdotorg.org;
>> u-boot at lists.denx.de
>>
>> Subject: Re: [U-Boot] [PATCH v2 3/3] bootm: use genimg_get_kernel_addr()
>>
>> On Thu, Aug 14, 2014 at 06:00:31PM -0700, York Sun wrote:
>>> On 08/04/2014 05:43 PM, Bryan Wu wrote:
>>> > Use the new API which is originally taken out from boot_get_kernel
>>> > of bootm.c
>>> >
>>> > Signed-off-by: Bryan Wu <pengw@nvidia.com>
>>> > Tested-by: Stephen Warren <swarren@nvidia.com>
>>> > Reviewed-by: Stephen Warren <swarren@nvidia.com>
>>> > ---
>>> > common/bootm.c | 25 +++++--------------------
>>> > 1 file changed, 5 insertions(+), 20 deletions(-)
>>> >
>>> > diff --git a/common/bootm.c b/common/bootm.c
>>> > index 7ec2ed8..621bff2 100644
>>> > --- a/common/bootm.c
>>> > +++ b/common/bootm.c
>>>
>>> <snip>
>>>
>>> > bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
>>> >
>>> > @@ -807,6 +788,10 @@ static const void *boot_get_kernel(cmd_tbl_t
>>> > *cmdtp, int flag, int argc,
>>> > #endif
>>> > #if defined(CONFIG_FIT)
>>> > case IMAGE_FORMAT_FIT:
>>> > + if (!fit_parse_conf(argv[0], load_addr, &img_addr,
>>> > + fit_uname_config))
>>> > + fit_parse_subimage(argv[0], load_addr, &img_addr,
>>> > + fit_uname_kernel);
>>> > os_noffset = fit_image_load(images, img_addr,
>>> > &fit_uname_kernel, &fit_uname_config,
>>> > IH_ARCH_DEFAULT, IH_TYPE_KERNEL,
>>> >
>>>
>>> Did anyone test this addition? It breaks my booting. The variable img_addr
>>> get
>>> changed for calling fit_parse_conf(). If I don't use load_addr variable
>>> and run
>>> "bootm <addr>" with a FIT image, this will fail. It took me hours to
>>> figure out.
>>
>> How exactly are you booting? I tested a fit with bootm addr#conf at 1 or
>> so.
>>
>> --
>> Tom