diff options
| author | Suzuki K. Poulose <suzuki@in.ibm.com> | 2013-03-06 14:08:33 +0530 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-03-08 13:57:30 +0900 |
| commit | 4255d2b07d231a3ff037fdf5aafa80e4f90c937d (patch) | |
| tree | f142b60f4ad3a99193f33aeb37f4657eca4a07c2 /kexec/kexec-uImage.c | |
| parent | c37f23c20bf4f15b951f1bbbb9c69e42a00dff3c (diff) | |
kexec/uImage: Introduce uImage_probe_kernel
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.
Introduce a uImage_probe_kernel() which can be used by the archs to check if
the supplied payload is one of the KERNEL types.
Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec-uImage.c')
| -rw-r--r-- | kexec/kexec-uImage.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/kexec/kexec-uImage.c b/kexec/kexec-uImage.c index 3bc85c5..3799a3b 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; @@ -84,7 +88,15 @@ int uImage_probe(const unsigned char *buf, off_t len, unsigned int arch) return -1; } #endif - return 0; + return (int)header.ih_type; +} + +int uImage_probe_kernel(const unsigned char *buf, off_t len, unsigned int arch) +{ + int type = uImage_probe(buf, len, arch); + + return (type == IH_TYPE_KERNEL || type == IH_TYPE_KERNEL_NOLOAD) ? + 0 : -1; } #ifdef HAVE_LIBZ |