summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBryan Wu <cooloney@gmail.com>2014-07-31 17:40:00 -0700
committerTom Rini <trini@ti.com>2014-08-09 11:26:15 -0400
commitb3dd64f5d537b41fc52a03e697271774891f4a70 (patch)
treebcf7086c94feea4c3124a8029392cdc74f2fd01f /common
parent1fb7d0e61996971757876228ceed74c3a401ffea (diff)
downloadu-boot-imx-b3dd64f5d537b41fc52a03e697271774891f4a70.zip
u-boot-imx-b3dd64f5d537b41fc52a03e697271774891f4a70.tar.gz
u-boot-imx-b3dd64f5d537b41fc52a03e697271774891f4a70.tar.bz2
bootm: use genimg_get_kernel_addr()
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> [trini: Fix warnings with CONFIG_FIT] Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
-rw-r--r--common/bootm.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/common/bootm.c b/common/bootm.c
index 7ec2ed8..76d811c 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -731,26 +731,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
int os_noffset;
#endif
- /* find out kernel image address */
- if (argc < 1) {
- img_addr = load_addr;
- debug("* kernel: default image load address = 0x%08lx\n",
- load_addr);
-#if defined(CONFIG_FIT)
- } else if (fit_parse_conf(argv[0], load_addr, &img_addr,
- &fit_uname_config)) {
- debug("* kernel: config '%s' from image at 0x%08lx\n",
- fit_uname_config, img_addr);
- } else if (fit_parse_subimage(argv[0], load_addr, &img_addr,
- &fit_uname_kernel)) {
- debug("* kernel: subimage '%s' from image at 0x%08lx\n",
- fit_uname_kernel, img_addr);
-#endif
- } else {
- img_addr = simple_strtoul(argv[0], NULL, 16);
- debug("* kernel: cmdline image address = 0x%08lx\n",
- img_addr);
- }
+ img_addr = genimg_get_kernel_addr(argv[0]);
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,