summaryrefslogtreecommitdiff
path: root/target/linux/malta/patches
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-13 07:29:25 +0000
committerJohn Crispin <john@openwrt.org>2015-02-13 07:29:25 +0000
commit91c07334d887d81a3a177f45f6a3e613cf414dd9 (patch)
tree2386899fae4987312b16371da9eb9c4dab362293 /target/linux/malta/patches
parent440d9ddf7f5548c2bc594b66e9d5d710cfbbc0a9 (diff)
downloadmtk-20170518-91c07334d887d81a3a177f45f6a3e613cf414dd9.zip
mtk-20170518-91c07334d887d81a3a177f45f6a3e613cf414dd9.tar.gz
mtk-20170518-91c07334d887d81a3a177f45f6a3e613cf414dd9.tar.bz2
generic: improve kexec support of MIPS.
- Allow --command-line parameters of kexec-tools be parsed and used by the kernel. - For malta machine, mark kernel code and kernel data segments as "System RAM" instead of "reserved" in /proc/iomem, otherwise kexec-tools will complain that program segments in ELF kernel file are invalid. Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> SVN-Revision: 44429
Diffstat (limited to 'target/linux/malta/patches')
-rw-r--r--target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch b/target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch
new file mode 100644
index 0000000..4457d75
--- /dev/null
+++ b/target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch
@@ -0,0 +1,39 @@
+From 79c7301c922f5023f85805a4ba969ce55f51d0ca Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <yszhou4tech@gmail.com>
+Date: Sat, 31 Jan 2015 15:13:12 +0800
+Subject: [PATCH 330/331] MIPS: Malta: Mark kernel code and kernel data
+ segments as BOOT_MEM_RAM.
+
+Kexec-tools requires those segments listed as "System RAM" in
+/proc/iomem, otherwise, an error message of "Invalid memory segment"
+will be emitted when trying to load the ELF kernel image.
+
+Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
+---
+ arch/mips/mti-malta/malta-memory.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
+index 8fddd2cd..1d562f0 100644
+--- a/arch/mips/mti-malta/malta-memory.c
++++ b/arch/mips/mti-malta/malta-memory.c
+@@ -106,14 +106,9 @@ fw_memblock_t * __init fw_getmdesc(int eva)
+ mdesc[2].base = mdesc[0].base + 0x000f0000UL;
+ mdesc[2].size = 0x00010000;
+
+- mdesc[3].type = fw_dontuse;
++ mdesc[3].type = fw_free;
+ mdesc[3].base = mdesc[0].base + 0x00100000UL;
+- mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_end)) -
+- 0x00100000UL;
+-
+- mdesc[4].type = fw_free;
+- mdesc[4].base = mdesc[0].base + CPHYSADDR(PFN_ALIGN(&_end));
+- mdesc[4].size = memsize - CPHYSADDR(mdesc[4].base);
++ mdesc[3].size = memsize - CPHYSADDR(mdesc[3].base);
+
+ return &mdesc[0];
+ }
+--
+1.7.10.4
+