summaryrefslogtreecommitdiff
path: root/kexec/arch/arm/kexec-arm.c
diff options
context:
space:
mode:
authorMarc Andre Tanner <mat@brain-dump.org>2009-11-20 21:07:42 +0100
committerSimon Horman <horms@verge.net.au>2009-11-21 14:31:11 +1100
commitaee54c10512b494747b03121fb0b3b1e91f63645 (patch)
tree765749fb08ec8954e5be696afffa88b4ad5e303a /kexec/arch/arm/kexec-arm.c
parentd06ff6009ae59c21b5549896d55445cf47894ee9 (diff)
kexec-arm: add uImage support
uImages are basically just zImages with a special header, we therefore just skip the header and let the normal zImage infrastructure do the actual work. Signed-off-by: Marc Andre Tanner <mat@brain-dump.org> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/arm/kexec-arm.c')
-rw-r--r--kexec/arch/arm/kexec-arm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kexec/arch/arm/kexec-arm.c b/kexec/arch/arm/kexec-arm.c
index 2e50489..3fdf839 100644
--- a/kexec/arch/arm/kexec-arm.c
+++ b/kexec/arch/arm/kexec-arm.c
@@ -74,6 +74,9 @@ int get_memory_ranges(struct memory_range **range, int *ranges,
/* Supported file types and callbacks */
struct file_type file_type[] = {
+ /* uImage is probed before zImage because the latter also accepts
+ uncompressed images. */
+ {"uImage", uImage_arm_probe, uImage_arm_load, zImage_arm_usage},
{"zImage", zImage_arm_probe, zImage_arm_load, zImage_arm_usage},
};
int file_types = sizeof(file_type) / sizeof(file_type[0]);