diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-13 07:29:25 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-13 07:29:25 +0000 |
| commit | d80c40d1322794fe66a8f6fb092a839310965ab0 (patch) | |
| tree | 588980d02824894fae600a5501b9d974f87dd39e /target/linux/malta | |
| parent | d0daa2af6eac0a9108de4407968cfd5e9bd09783 (diff) | |
| download | upstream-d80c40d1322794fe66a8f6fb092a839310965ab0.tar.gz upstream-d80c40d1322794fe66a8f6fb092a839310965ab0.tar.bz2 upstream-d80c40d1322794fe66a8f6fb092a839310965ab0.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44429 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/malta')
| -rw-r--r-- | target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch | 39 |
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 0000000000..4457d75e29 --- /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 + |