diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-15 08:24:36 -0500 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-08-26 23:31:33 +0200 |
commit | c160a9544743e80e8889edb2275538e7764ce334 (patch) | |
tree | 484a54af158348313ed5f3b4890a6bbb56e7e468 /lib_arm/bootm.c | |
parent | 20220d22b9f41446288588cd2e457e0077a18bed (diff) | |
download | u-boot-c160a9544743e80e8889edb2275538e7764ce334.tar.gz u-boot-c160a9544743e80e8889edb2275538e7764ce334.tar.bz2 u-boot-c160a9544743e80e8889edb2275538e7764ce334.zip |
bootm: refactor entry point code
Move entry point code out of each arch and into common code.
Keep the entry point in the bootm_headers_t images struct.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'lib_arm/bootm.c')
-rw-r--r-- | lib_arm/bootm.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 955a1ae3a2..5660a503dc 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -62,7 +62,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) { ulong initrd_start, initrd_end; - ulong ep = 0; bd_t *bd = gd->bd; char *s; int machid = bd->bi_arch_number; @@ -73,23 +72,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], char *commandline = getenv ("bootargs"); #endif - /* find kernel entry point */ - if (images->legacy_hdr_valid) { - ep = image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT) - } else if (images->fit_uname_os) { - ret = fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); - if (ret) { - puts ("Can't get entry point property!\n"); - goto error; - } -#endif - } else { - puts ("Could not find kernel entry point!\n"); - goto error; - } - theKernel = (void (*)(int, int, uint))ep; + theKernel = (void (*)(int, int, uint))images->ep; s = getenv ("machid"); if (s) { |