mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 18:32:20 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
49e2197063
commit
2db176f5f2
@@ -1,43 +0,0 @@
|
||||
From bb6a26371d15473b380459ac4404bf330634b585 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 20 Dec 2019 17:21:08 +0100
|
||||
Subject: [PATCH] kexec: un-break the build on 32 bit x86
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
kexec/arch/i386/Makefile | 1 +
|
||||
kexec/arch/i386/kexec-x86.h | 4 ++++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
|
||||
index f486103..5d560be 100644
|
||||
--- a/kexec/arch/i386/Makefile
|
||||
+++ b/kexec/arch/i386/Makefile
|
||||
@@ -12,6 +12,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
|
||||
i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
|
||||
i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
|
||||
i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
|
||||
+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
|
||||
|
||||
dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \
|
||||
kexec/arch/i386/crashdump-x86.h \
|
||||
diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
|
||||
index 0f941df..c423171 100644
|
||||
--- a/kexec/arch/i386/kexec-x86.h
|
||||
+++ b/kexec/arch/i386/kexec-x86.h
|
||||
@@ -56,9 +56,13 @@ struct arch_options_t {
|
||||
};
|
||||
|
||||
int multiboot_x86_probe(const char *buf, off_t len);
|
||||
+int multiboot2_x86_probe(const char *buf, off_t len);
|
||||
int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
|
||||
struct kexec_info *info);
|
||||
+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
|
||||
+ struct kexec_info *info);
|
||||
void multiboot_x86_usage(void);
|
||||
+void multiboot2_x86_usage(void);
|
||||
|
||||
int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
|
||||
struct kexec_info *info);
|
||||
@@ -17,7 +17,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
|
||||
file://0002-purgatory-Pass-r-directly-to-linker.patch \
|
||||
file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
|
||||
file://0005-Disable-PIE-during-link.patch \
|
||||
file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \
|
||||
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user