On Thu, Aug 14, 2014 at 6:00 PM, York Sun yorksun@freescale.com 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.
Why is this change needed? What does it fix?
York
I think Tom merged one with the fixing:
---- + 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); ----
Can you try that? -Bryan