aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-28 22:42:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-28 22:42:49 +0000
commit1923d633186ad969cbecade300986d84a27c3ff7 (patch)
tree4b69107be0506ba5a8c1a2e82a449d0a612604c1 /target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch
parent37f09b8129aadb8cba52c15446a31dfb59328e16 (diff)
downloadupstream-1923d633186ad969cbecade300986d84a27c3ff7.tar.gz
upstream-1923d633186ad969cbecade300986d84a27c3ff7.tar.bz2
upstream-1923d633186ad969cbecade300986d84a27c3ff7.zip
malta: move to 4.4 kernel
Linux now has device tree support for malta. The patch for correcting /proc/iomem content is not needed now. Previously it was root@(none):/# cat /proc/iomem 00000000-00000fff : reserved 00001000-000effff : System RAM 000f0000-000fffff : reserved 00100000-0fffefff : System RAM 00100000-003f2b6b : Kernel code 003f2b6c-00485937 : Kernel data ... Now it's root@OpenWrt:/# cat /proc/iomem 00000000-0fffefff : System RAM 00100000-004a3297 : Kernel code 004a3298-0057cfff : Kernel data ... The kernel config was prepared as follows 1. cp target/linux/malta/config-{3.18,4.4} 2. make kernel_menuconfig CONFIG_TARGET=subtarget_platform Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> SVN-Revision: 48543
Diffstat (limited to 'target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch')
-rw-r--r--target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch34
1 files changed, 0 insertions, 34 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
deleted file mode 100644
index 789be50313..0000000000
--- a/target/linux/malta/patches/330-MIPS-Malta-Mark-kernel-code-and-kernel-data-segments.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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(-)
-
---- a/arch/mips/mti-malta/malta-memory.c
-+++ b/arch/mips/mti-malta/malta-memory.c
-@@ -112,14 +112,9 @@ fw_memblock_t * __init fw_getmdesc(int e
- 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];
- }