diff options
Diffstat (limited to 'kexec/arch/arm/kexec-zImage-arm.c')
| -rw-r--r-- | kexec/arch/arm/kexec-zImage-arm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c index 72fcdd8..1a446d9 100644 --- a/kexec/arch/arm/kexec-zImage-arm.c +++ b/kexec/arch/arm/kexec-zImage-arm.c @@ -130,7 +130,7 @@ struct tag * atag_read_tags(void) static int atag_arm_load(struct kexec_info *info, unsigned long base, const char *command_line, off_t command_line_len, - const char *initrd, off_t initrd_len) + const char *initrd, off_t initrd_len, off_t initrd_off) { struct tag *saved_tags = atag_read_tags(); char *buf; @@ -196,10 +196,8 @@ int atag_arm_load(struct kexec_info *info, unsigned long base, add_segment(info, buf, len, base, len); if (initrd) { - struct memory_range *range; - int ranges; - get_memory_ranges(&range, &ranges, info->kexec_flags); - *initrd_start = locate_hole(info, initrd_len, getpagesize(), range[0].start + 0x800000, ULONG_MAX, INT_MAX); + *initrd_start = locate_hole(info, initrd_len, getpagesize(), + initrd_off, ULONG_MAX, INT_MAX); if (*initrd_start == ULONG_MAX) return -1; add_segment(info, initrd, initrd_len, *initrd_start, initrd_len); @@ -219,6 +217,7 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, const char *ramdisk; char *ramdisk_buf; off_t ramdisk_length; + off_t ramdisk_offset; int opt; #define OPT_APPEND 'a' #define OPT_RAMDISK 'r' @@ -271,9 +270,14 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, if (base == ULONG_MAX) return -1; + /* assume the maximum kernel compression ratio is 4, + * and just to be safe, place ramdisk after that + */ + ramdisk_offset = base + len * 4; + if (atag_arm_load(info, base + atag_offset, command_line, command_line_len, - ramdisk_buf, ramdisk_length) == -1) + ramdisk_buf, ramdisk_length, ramdisk_offset) == -1) return -1; add_segment(info, buf, len, base + offset, len); |