From 6c454fedf5195e4160bd7aa398f7a4bb17d7157c Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Fri, 15 Aug 2014 16:51:38 -0700 Subject: image: fix bootm failure for FIT image Commit b3dd64f5d537 "bootm: use genimg_get_kernel_addr()" introduced a bug for booting FIT image. It's because calling fit_parse_config() twice will give us wrong value in img_addr. Add a new function genimg_get_kernel_addr_fit() whichl will always return fit_uname_config and fit_uname_kernel for CONFIG_FIT. genimg_get_kernel_addr() will ignore those to parameters. Reported-by: York Sun Signed-off-by: Bryan Wu --- include/image.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/image.h') diff --git a/include/image.h b/include/image.h index ca2fe86..69f86ad 100644 --- a/include/image.h +++ b/include/image.h @@ -424,6 +424,9 @@ enum fit_load_op { #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */ #define IMAGE_FORMAT_ANDROID 0x03 /* Android boot image */ +ulong genimg_get_kernel_addr_fit(char * const img_addr, + const char **fit_uname_config, + const char **fit_uname_kernel); ulong genimg_get_kernel_addr(char * const img_addr); int genimg_get_format(const void *img_addr); int genimg_has_config(bootm_headers_t *images); -- cgit v1.1