diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-20 22:15:46 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-20 22:15:46 +0000 |
| commit | 7e5f90fa3ff32ea31548666d57a78005555ecf34 (patch) | |
| tree | 0d86d65def6790392c369b2cf9ab7a43789bd79d | |
| parent | 5a9154e06919020dd2588fb1fbb32c1bedb3a79c (diff) | |
| download | focaccia-qemu-7e5f90fa3ff32ea31548666d57a78005555ecf34.tar.gz focaccia-qemu-7e5f90fa3ff32ea31548666d57a78005555ecf34.zip | |
uImage: only try to load 'kernel' images (Hollis Blanchard)
Loading other image types (e.g. IH_TYPE_MULTI, IH_TYPE_FLATDT) is not implemented. IH_TYPE_STANDALONE images could be loaded, but would unexpectedly fail if they tried to use any uboot services. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5765 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/loader.c b/loader.c index f9f37b2368..cca9d3b7db 100644 --- a/loader.c +++ b/loader.c @@ -479,9 +479,9 @@ int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr, if (hdr->ih_magic != IH_MAGIC) goto out; - /* TODO: Implement Multi-File images. */ - if (hdr->ih_type == IH_TYPE_MULTI) { - fprintf(stderr, "Unable to load multi-file u-boot images\n"); + /* TODO: Implement other image types. */ + if (hdr->ih_type != IH_TYPE_KERNEL) { + fprintf(stderr, "Can only load u-boot image type \"kernel\"\n"); goto out; } @@ -498,7 +498,7 @@ int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr, /* TODO: Check CPU type. */ if (is_linux) { - if (hdr->ih_type == IH_TYPE_KERNEL && hdr->ih_os == IH_OS_LINUX) + if (hdr->ih_os == IH_OS_LINUX) *is_linux = 1; else *is_linux = 0; |