080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
102 lines
3.3 KiB
Diff
102 lines
3.3 KiB
Diff
From 896fb2aa30c6acf0c651ba80e4ef661517b4aac4 Mon Sep 17 00:00:00 2001
|
|
From: David Woodhouse <dwmw@amazon.co.uk>
|
|
Date: Wed, 8 Mar 2017 22:41:13 +0000
|
|
Subject: [PATCH 27/45] arm64: add uImage support
|
|
|
|
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/arch/arm64/Makefile | 3 +++
|
|
kexec/arch/arm64/kexec-arm64.c | 1 +
|
|
kexec/arch/arm64/kexec-arm64.h | 4 ++++
|
|
kexec/arch/arm64/kexec-uImage-arm64.c | 34 ++++++++++++++++++++++++++++++++++
|
|
4 files changed, 42 insertions(+)
|
|
create mode 100644 kexec/arch/arm64/kexec-uImage-arm64.c
|
|
|
|
diff --git a/kexec/arch/arm64/Makefile b/kexec/arch/arm64/Makefile
|
|
index 74b677f7784e..a931f0e94012 100644
|
|
--- a/kexec/arch/arm64/Makefile
|
|
+++ b/kexec/arch/arm64/Makefile
|
|
@@ -12,8 +12,11 @@ arm64_KEXEC_SRCS += \
|
|
kexec/arch/arm64/crashdump-arm64.c \
|
|
kexec/arch/arm64/kexec-arm64.c \
|
|
kexec/arch/arm64/kexec-elf-arm64.c \
|
|
+ kexec/arch/arm64/kexec-uImage-arm64.c \
|
|
kexec/arch/arm64/kexec-image-arm64.c
|
|
|
|
+arm64_UIMAGE = kexec/kexec-uImage.c
|
|
+
|
|
arm64_ARCH_REUSE_INITRD =
|
|
arm64_ADD_SEGMENT =
|
|
arm64_VIRT_TO_PHYS =
|
|
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
|
|
index 04fd3968bb52..c82293973936 100644
|
|
--- a/kexec/arch/arm64/kexec-arm64.c
|
|
+++ b/kexec/arch/arm64/kexec-arm64.c
|
|
@@ -40,6 +40,7 @@ const struct arch_map_entry arches[] = {
|
|
struct file_type file_type[] = {
|
|
{"vmlinux", elf_arm64_probe, elf_arm64_load, elf_arm64_usage},
|
|
{"Image", image_arm64_probe, image_arm64_load, image_arm64_usage},
|
|
+ {"uImage", uImage_arm64_probe, uImage_arm64_load, uImage_arm64_usage},
|
|
};
|
|
|
|
int file_types = sizeof(file_type) / sizeof(file_type[0]);
|
|
diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h
|
|
index bd4c20e76d15..bf724ef16573 100644
|
|
--- a/kexec/arch/arm64/kexec-arm64.h
|
|
+++ b/kexec/arch/arm64/kexec-arm64.h
|
|
@@ -30,6 +30,10 @@ int image_arm64_probe(const char *kernel_buf, off_t kernel_size);
|
|
int image_arm64_load(int argc, char **argv, const char *kernel_buf,
|
|
off_t kernel_size, struct kexec_info *info);
|
|
void image_arm64_usage(void);
|
|
+int uImage_arm64_probe(const char *buf, off_t len);
|
|
+int uImage_arm64_load(int argc, char **argv, const char *buf, off_t len,
|
|
+ struct kexec_info *info);
|
|
+void uImage_arm64_usage(void);
|
|
|
|
off_t initrd_base;
|
|
off_t initrd_size;
|
|
diff --git a/kexec/arch/arm64/kexec-uImage-arm64.c b/kexec/arch/arm64/kexec-uImage-arm64.c
|
|
new file mode 100644
|
|
index 000000000000..022d7ee4693a
|
|
--- /dev/null
|
|
+++ b/kexec/arch/arm64/kexec-uImage-arm64.c
|
|
@@ -0,0 +1,34 @@
|
|
+/*
|
|
+ * uImage support added by David Woodhouse <dwmw2@infradead.org>
|
|
+ */
|
|
+#include <stdint.h>
|
|
+#include <string.h>
|
|
+#include <sys/types.h>
|
|
+#include <image.h>
|
|
+#include <kexec-uImage.h>
|
|
+#include "../../kexec.h"
|
|
+#include "kexec-arm64.h"
|
|
+
|
|
+int uImage_arm64_probe(const char *buf, off_t len)
|
|
+{
|
|
+ return uImage_probe_kernel(buf, len, IH_ARCH_ARM64);
|
|
+}
|
|
+
|
|
+int uImage_arm64_load(int argc, char **argv, const char *buf, off_t len,
|
|
+ struct kexec_info *info)
|
|
+{
|
|
+ struct Image_info img;
|
|
+ int ret;
|
|
+
|
|
+ ret = uImage_load(buf, len, &img);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ return image_arm64_load(argc, argv, img.buf, img.len, info);
|
|
+}
|
|
+
|
|
+void uImage_arm64_usage(void)
|
|
+{
|
|
+ printf(
|
|
+" An ARM64 U-boot uImage file, compressed or not, big or little endian.\n\n");
|
|
+}
|
|
--
|
|
2.13.0
|
|
|