[PATCH 1/3] kexec/uImage: Return the image type for uImage_probe

[Suzuki K. Poulose]

From: Suzuki K. Poulose <suzuki at in.ibm.com>

uImage supports different types of payloads, including kernel,
ramdisks etc. uImage_probe() as of now checks whether the supplied
payload is of type KERNEL ( i.e, IH_TYPE_KERNEL or IH_TYPE_KERNEL_NOLOAD ).

Change this behaviour to return the image type, if it is one of the supported
payloads. This change is in prepartion to support ramdisks in uImage format.

Also, I have changed the code to check for the OS type only for the kernel images.

Is this check really needed ? We shouldn't bother what OS is being loaded. Isn't it ?

This change would allow the user to decide if the image is of their interest.

Signed-off-by: Suzuki K. Poulose <suzuki at in.ibm.com>
---
 kexec/arch/arm/kexec-uImage-arm.c |    8 +++++++-
 kexec/arch/ppc/kexec-uImage-ppc.c |    8 +++++++-
 kexec/arch/sh/kexec-uImage-sh.c   |    9 ++++++++-
 kexec/kexec-uImage.c              |   16 ++++++++++------
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/kexec/arch/arm/kexec-uImage-arm.c b/kexec/arch/arm/kexec-uImage-arm.c
index 4875185..dc1bcb8 100644
--- a/kexec/arch/arm/kexec-uImage-arm.c
+++ b/kexec/arch/arm/kexec-uImage-arm.c
@@ -11,7 +11,13 @@
 
 int uImage_arm_probe(const char *buf, off_t len)
 {
-	return uImage_probe(buf, len, IH_ARCH_ARM);
+	int type;
+	int rc = -1;
+
+	type = uImage_probe(buf, len, IH_ARCH_ARM);
+	if (type == IH_TYPE_KERNEL || type == IH_TYPE_KERNEL_NOLOAD)
+		rc = 0;
+	return rc;
 }
 
 int uImage_arm_load(int argc, char **argv, const char *buf, off_t len,
diff --git a/kexec/arch/ppc/kexec-uImage-ppc.c b/kexec/arch/ppc/kexec-uImage-ppc.c
index e55bf94..eaea3c1 100644
--- a/kexec/arch/ppc/kexec-uImage-ppc.c
+++ b/kexec/arch/ppc/kexec-uImage-ppc.c
@@ -48,7 +48,13 @@ void uImage_ppc_usage(void)
 
 int uImage_ppc_probe(const char *buf, off_t len)
 {
-	return uImage_probe(buf, len, IH_ARCH_PPC);
+	int type;
+	int rc = -1;
+
+	type = uImage_probe(buf, len, IH_ARCH_PPC);
+	if (type == IH_TYPE_KERNEL || type == IH_TYPE_KERNEL_NOLOAD)
+		rc = 0;
+	return rc;
 }
 
 static int ppc_load_bare_bits(int argc, char **argv, const char *buf,
diff --git a/kexec/arch/sh/kexec-uImage-sh.c b/kexec/arch/sh/kexec-uImage-sh.c
index e983165..54bb073 100644
--- a/kexec/arch/sh/kexec-uImage-sh.c
+++ b/kexec/arch/sh/kexec-uImage-sh.c
@@ -13,7 +13,14 @@
 
 int uImage_sh_probe(const char *buf, off_t len)
 {
-	return uImage_probe(buf, len, IH_ARCH_SH);
+	int type;
+	int rc = -1;
+
+	type = uImage_probe(buf, len, IH_ARCH_SH);
+	if (type == IH_TYPE_KERNEL || type == IH_TYPE_KERNEL_NOLOAD)
+		rc = uImage_probe(buf, len, IH_ARCH_SH);
+
+	return rc;
 }
 
 int uImage_sh_load(int argc, char **argv, const char *buf, off_t len,
diff --git a/kexec/kexec-uImage.c b/kexec/kexec-uImage.c
index 3bc85c5..dcbd635 100644
--- a/kexec/kexec-uImage.c
+++ b/kexec/kexec-uImage.c
@@ -16,6 +16,10 @@
  * Basic uImage loader. Not rocket science.
  */
 
+/*
+ * Returns the image type if everything goes well. This would
+ * allow the user to decide if the image is of their interest.
+ */
 int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch)
 {
 	struct image_header header;
@@ -42,17 +46,17 @@ int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch)
 	switch (header.ih_type) {
 	case IH_TYPE_KERNEL:
 	case IH_TYPE_KERNEL_NOLOAD:
+		/* XXX: Should we really check this ? */
+		if (header.ih_os != IH_OS_LINUX) {
+			printf("uImage os %d unsupported\n", header.ih_os);
+			return -1;
+		}
 		break;
 	default:
 		printf("uImage type %d unsupported\n", header.ih_type);
 		return -1;
 	}
 
-	if (header.ih_os != IH_OS_LINUX) {
-		printf("uImage os %d unsupported\n", header.ih_os);
-		return -1;
-	}
-
 	if (header.ih_arch != arch) {
 		printf("uImage arch %d unsupported\n", header.ih_arch);
 		return -1;
@@ -84,7 +88,7 @@ int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch)
 		return -1;
 	}
 #endif
-	return 0;
+	return (int)header.ih_type;
 }
 
 #ifdef HAVE_LIBZ