summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-12-04 08:13:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-06 11:09:52 +0000
commit2db176f5f235f793d82d0413c071c3b259f858aa (patch)
tree1afe21cd5beee85c6f871f04135697adff9e28bb /meta
parent49e2197063d2b6f6228b2b3a25a63d855fb7b99c (diff)
downloadpoky-2db176f5f235f793d82d0413c071c3b259f858aa.tar.gz
kexec-tools: drop unneeded patch
(From OE-Core rev: 83ad4c858ad92637c26530aa80e37eed18d10b45) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch43
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb1
2 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch
deleted file mode 100644
index 36b0845f4a..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Dec 2019 17:21:08 +0100
4Subject: [PATCH] kexec: un-break the build on 32 bit x86
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 kexec/arch/i386/Makefile | 1 +
11 kexec/arch/i386/kexec-x86.h | 4 ++++
12 2 files changed, 5 insertions(+)
13
14diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
15index f486103..5d560be 100644
16--- a/kexec/arch/i386/Makefile
17+++ b/kexec/arch/i386/Makefile
18@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
19 i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
20 i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
21 i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
22+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
23
24 dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
25 kexec/arch/i386/crashdump-x86.h \
26diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
27index 0f941df..c423171 100644
28--- a/kexec/arch/i386/kexec-x86.h
29+++ b/kexec/arch/i386/kexec-x86.h
30@@ -56,9 +56,13 @@ struct arch_options_t {
31 };
32
33 int multiboot_x86_probe(const char *buf, off_t len);
34+int multiboot2_x86_probe(const char *buf, off_t len);
35 int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
36 struct kexec_info *info);
37+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
38+ struct kexec_info *info);
39 void multiboot_x86_usage(void);
40+void multiboot2_x86_usage(void);
41
42 int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
43 struct kexec_info *info);
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
index 22a9498a7b..066de99fad 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb
@@ -17,7 +17,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
17 file://0002-purgatory-Pass-r-directly-to-linker.patch \ 17 file://0002-purgatory-Pass-r-directly-to-linker.patch \
18 file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ 18 file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
19 file://0005-Disable-PIE-during-link.patch \ 19 file://0005-Disable-PIE-during-link.patch \
20 file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
21 file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ 20 file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
22 " 21 "
23 22