diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-16 15:43:57 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-16 16:47:04 +0200 |
commit | 486383e43d266c25c9fcfdab68b013b8923a8b66 (patch) | |
tree | e905141eeb2b0067b5097b44e5d7bf0d59cea44a /patches | |
parent | abb98382036ab841eedbde38bd23af658520742f (diff) | |
download | ptxdist-486383e43d266c25c9fcfdab68b013b8923a8b66.tar.gz ptxdist-486383e43d266c25c9fcfdab68b013b8923a8b66.tar.xz |
kexec-tools: add upstream build fix for i386
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch | 64 | ||||
-rw-r--r-- | patches/kexec-tools-2.0.20/series | 4 |
2 files changed, 68 insertions, 0 deletions
diff --git a/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch b/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch new file mode 100644 index 000000000..b2219c12c --- /dev/null +++ b/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch @@ -0,0 +1,64 @@ +From: Chris Packham <chris.packham@alliedtelesis.co.nz> +Date: Mon, 18 Nov 2019 12:52:15 +1300 +Subject: [PATCH] kexec: build multiboot2 for i386 + +This addresses the following compilation issues when building for i386. + + kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_probe + kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'? + { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, + ^~~~~~~~~~~~~~~~~~~ + multiboot_x86_load + kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'? + multiboot2_x86_usage }, + ^~~~~~~~~~~~~~~~~~~~ + multiboot_x86_usage + make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1 + make: *** Waiting for unfinished jobs.... + +Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> +Signed-off-by: Simon Horman <horms@verge.net.au> +--- + kexec/arch/i386/Makefile | 2 +- + kexec/arch/i386/kexec-x86.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile +index 105cefd60695..f4861030a4bb 100644 +--- a/kexec/arch/i386/Makefile ++++ b/kexec/arch/i386/Makefile +@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c + i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c ++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c + 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 +@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c + + dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ + kexec/arch/i386/crashdump-x86.h \ +- kexec/arch/i386/kexec-mb2-x86.c \ + kexec/arch/i386/kexec-x86.h \ + kexec/arch/i386/x86-linux-setup.h \ + kexec/arch/i386/include/arch/options.h +diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h +index 1b58c3b65cb0..0f941dfeee3f 100644 +--- a/kexec/arch/i386/kexec-x86.h ++++ b/kexec/arch/i386/kexec-x86.h +@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); + void multiboot_x86_usage(void); + ++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info); ++void multiboot2_x86_usage(void); ++int multiboot2_x86_probe(const char *buf, off_t buf_len); ++ + int elf_x86_probe(const char *buf, off_t len); + int elf_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); diff --git a/patches/kexec-tools-2.0.20/series b/patches/kexec-tools-2.0.20/series new file mode 100644 index 000000000..49a919421 --- /dev/null +++ b/patches/kexec-tools-2.0.20/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-kexec-build-multiboot2-for-i386.patch +# cda056db64f75b557a39e79b142865b0 - git-ptx-patches magic |