From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L3HoV-0002O4-Ok
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:15:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L3HoV-0002NM-32
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:15:51 -0500
Received: from [199.232.76.173] (port=37830 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L3HoU-0002NC-RA
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:15:50 -0500
Received: from savannah.gnu.org ([199.232.41.3]:38372 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L3HoU-0007RB-OO
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:15:50 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L3HoT-0003ZD-Fa
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:15:49 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1L3HoS-0003Z9-51
	for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:15:48 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1L3HoS-0003Z9-51@cvs.savannah.gnu.org>
Date: Thu, 20 Nov 2008 22:15:48 +0000
Subject: [Qemu-devel] [5765] uImage: only try to load 'kernel' images
	(Hollis Blanchard)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5765
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5765
Author:   aliguori
Date:     2008-11-20 22:15:46 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/loader.c

Modified: trunk/loader.c
===================================================================
--- trunk/loader.c	2008-11-20 22:14:40 UTC (rev 5764)
+++ trunk/loader.c	2008-11-20 22:15:46 UTC (rev 5765)
@@ -479,9 +479,9 @@
     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 @@
 
     /* 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;