summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-03-12 10:32:59 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-03-12 10:32:59 +0100
commit3dfe110149311425919e6d6a14b561b4207498f1 (patch)
tree04db3063ff0395bc02327123307d76695042f025 /common
parentbc8ed486b125452ba3bd8344f052f437329150c5 (diff)
[new uImage] Add node offsets for FIT images listed in struct bootm_headers
This patch adds new node offset fields to struct bootm_headers and updates bootm_headers processing code to make use of them. Saved node offsets allow to avoid repeating fit_image_get_node() calls. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c23
-rw-r--r--common/image.c1
2 files changed, 9 insertions, 15 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index aca54b5a57..11c476e12b 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -130,9 +130,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ulong image_start, image_end;
ulong load_start, load_end;
ulong mem_start, mem_size;
-#if defined(CONFIG_FIT)
- int os_noffset;
-#endif
struct lmb lmb;
@@ -172,32 +169,27 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
break;
#if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT:
- os_noffset = fit_image_get_node (images.fit_hdr_os,
- images.fit_uname_os);
- if (os_noffset < 0) {
- printf ("Can't get image node for '%s'!\n",
- images.fit_uname_os);
- return 1;
- }
-
- if (fit_image_get_type (images.fit_hdr_os, os_noffset, &type)) {
+ if (fit_image_get_type (images.fit_hdr_os,
+ images.fit_noffset_os, &type)) {
puts ("Can't get image type!\n");
return 1;
}
- if (fit_image_get_comp (images.fit_hdr_os, os_noffset, &comp)) {
+ if (fit_image_get_comp (images.fit_hdr_os,
+ images.fit_noffset_os, &comp)) {
puts ("Can't get image compression!\n");
return 1;
}
- if (fit_image_get_os (images.fit_hdr_os, os_noffset, &os)) {
+ if (fit_image_get_os (images.fit_hdr_os,
+ images.fit_noffset_os, &os)) {
puts ("Can't get image OS!\n");
return 1;
}
image_end = fit_get_end (images.fit_hdr_os);
- if (fit_image_get_load (images.fit_hdr_os, os_noffset,
+ if (fit_image_get_load (images.fit_hdr_os, images.fit_noffset_os,
&load_start)) {
puts ("Can't get image load address!\n");
return 1;
@@ -569,6 +561,7 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
*os_data = (ulong)data;
images->fit_hdr_os = fit_hdr;
images->fit_uname_os = fit_uname_kernel;
+ images->fit_noffset_os = os_noffset;
break;
#endif
default:
diff --git a/common/image.c b/common/image.c
index 6458fb13f5..e838f65b69 100644
--- a/common/image.c
+++ b/common/image.c
@@ -891,6 +891,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
images->fit_hdr_rd = fit_hdr;
images->fit_uname_rd = fit_uname_ramdisk;
+ images->fit_noffset_rd = rd_noffset;
break;
#endif
default: